Revision tags: v2.6.22, v2.6.22-rc7, v2.6.22-rc6, v2.6.22-rc5, v2.6.22-rc4, v2.6.22-rc3, v2.6.22-rc2, v2.6.22-rc1 |
|
#
5c34202b |
| 11-May-2007 |
Wim Van Sebroeck <wim@iguana.be> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
f19b121e |
| 08-May-2007 |
akpm@linux-foundation.org <akpm@linux-foundation.org> |
Driver for the Maxim DS1WM, a 1-wire bus master ASIC core
Cc: Matt Reimer <mreimer@vpop.net>
[akpm@linux-foundation.org: kconfig update] Signed-off-by: Matt Reimer <mreimer@vpop.net> Signed-off-by:
Driver for the Maxim DS1WM, a 1-wire bus master ASIC core
Cc: Matt Reimer <mreimer@vpop.net>
[akpm@linux-foundation.org: kconfig update] Signed-off-by: Matt Reimer <mreimer@vpop.net> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
Revision tags: v2.6.21, v2.6.21-rc7, v2.6.21-rc6, v2.6.21-rc5, v2.6.21-rc4, v2.6.21-rc3, v2.6.21-rc2, v2.6.21-rc1, v2.6.20, v2.6.20-rc7, v2.6.20-rc6, v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1, v2.6.19, v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3, v2.6.19-rc2, v2.6.19-rc1, v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1 |
|
#
0a1340c1 |
| 03-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
|
#
55b4d6a5 |
| 29-Jun-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
|
#
62ed948c |
| 26-Jun-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
4854c7b2 |
| 26-Jun-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
bbe5d235 |
| 25-Jun-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
816724e6 |
| 24-Jun-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to overrid
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount'
show more ...
|
#
8cf60e04 |
| 23-Jun-2006 |
Tony Luck <tony.luck@intel.com> |
Auto-update from upstream
|
#
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, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1 |
|
#
81f6075e |
| 23-Mar-2006 |
Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
[PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver.
|
#
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 |
|
#
ec068072 |
| 06-Jan-2006 |
Adrian Bunk <bunk@stusta.de> |
[PATCH] fix W1_MASTER_DS9490_BRIDGE dependencies
W1_DS9490 was renamed to W1_MASTER_DS9490, but the entry in the dependencies of W1_MASTER_DS9490_BRIDGE was forgotten.
Signed-off-by: Adrian Bunk <b
[PATCH] fix W1_MASTER_DS9490_BRIDGE dependencies
W1_DS9490 was renamed to W1_MASTER_DS9490, but the entry in the dependencies of W1_MASTER_DS9490_BRIDGE was forgotten.
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
Revision tags: v2.6.15, v2.6.15-rc7, v2.6.15-rc6 |
|
#
baf12ae2 |
| 06-Dec-2005 |
Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
[PATCH] W1: Add the DS2482 I2C-to-w1 bridge driver.
Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@s
[PATCH] W1: Add the DS2482 I2C-to-w1 bridge driver.
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 ...
|
#
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 ...
|