#
8cf60e04 |
| 23-Jun-2006 |
Tony Luck <tony.luck@intel.com> |
Auto-update from upstream
|
#
deb0e9b2 |
| 23-Jun-2006 |
Andrew Morton <akpm@osdl.org> |
[PATCH] connector-exports
Put the connector exports at the functions so people can see them in context.
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew
[PATCH] connector-exports
Put the connector exports at the functions so people can see them in context.
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
dbe1ab95 |
| 23-Jun-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
#
71d530cd |
| 23-Jun-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
|
#
eaa85689 |
| 23-Jun-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6: [PATCH] w1: warning fix [PATCH] w1: clean up W1_CON dependency. [PA
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6: [PATCH] w1: warning fix [PATCH] w1: clean up W1_CON dependency. [PATCH] drivers/w1/w1.c: fix a compile error [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC [PATCH] W1: possible cleanups [PATCH] W1: cleanups [PATCH] w1 exports [PATCH] w1: Use mutexes instead of semaphores. [PATCH] w1: Make w1 connector notifications depend on connector. [PATCH] w1: netlink: Mark netlink group 1 as unused. [PATCH] w1: Move w1-connector definitions into linux/include/connector.h [PATCH] w1: Userspace communication protocol over connector. [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver. [PATCH] w1: Added default generic read/write operations.
show more ...
|
Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4 |
|
#
30841711 |
| 27-Apr-2006 |
Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
[PATCH] w1: clean up W1_CON dependency.
If w1 is not enabled, w1_con should not appear in configuration, even if no logic is turned on without w1. W1_CON should depend on W1 also.
Signed-off-by: Ra
[PATCH] w1: clean up W1_CON dependency.
If w1 is not enabled, w1_con should not appear in configuration, even if no logic is turned on without w1. W1_CON should depend on W1 also.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
Revision tags: v2.6.17-rc3, v2.6.17-rc2 |
|
#
46e07f6e |
| 03-Apr-2006 |
Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
[PATCH] w1: Make w1 connector notifications depend on connector.
Make w1 connector notifications depend on connector.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah
[PATCH] w1: Make w1 connector notifications depend on connector.
Make w1 connector notifications depend on connector.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
Revision tags: v2.6.17-rc1 |
|
#
95d465fd |
| 02-Apr-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus.
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c
|
#
86579dd0 |
| 31-Mar-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
#
d62e54ab |
| 31-Mar-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
#
79072f38 |
| 30-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
#
4bbf7bc4 |
| 24-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
|
#
1ebbe2b2 |
| 24-Mar-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'linus'
|
Revision tags: v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1, v2.6.15, v2.6.15-rc7, v2.6.15-rc6 |
|
#
bd529cfb |
| 06-Dec-2005 |
Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
[PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code into 'w1/slaves'
Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> S
[PATCH] W1: Move w1 bus master code into 'w1/masters' and move w1 slave code into 'w1/slaves'
Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
292dd876 |
| 27-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
#
0a0fc0dd |
| 24-Jan-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
#
944d7955 |
| 19-Jan-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
#
ea9b395f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
#
0825788f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
#
94bc2be3 |
| 12-Jan-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
#
a457aa6c |
| 10-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
|
#
a58a414f |
| 10-Jan-2006 |
Adrian Bunk <bunk@stusta.de> |
spelling: s/usefull/useful/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
Revision tags: v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1 |
|
#
2fc29911 |
| 06-Nov-2005 |
Thomas Gleixner <tglx@mtd.linutronix.de> |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
|
Revision tags: v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3 |
|
#
4e0c1159 |
| 25-Sep-2005 |
Dave Airlie <airlied@starflyer.(none)> |
update from upstream
|
Revision tags: v2.6.14-rc2 |
|
#
dbaa9a9d |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|