|
Revision tags: v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1 |
|
| #
f0eef253 |
| 12-Dec-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
| #
c4366889 |
| 12-Dec-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
|
| #
6a90cd24 |
| 08-Dec-2006 |
Josef Sipek <jsipek@fsl.cs.sunysb.edu> |
[PATCH] struct path: convert freevxfs
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
Revision tags: 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 |
|
| #
0612ec48 |
| 19-Sep-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
9b4f2e95 |
| 17-Sep-2006 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
show more ...
|
|
Revision tags: v2.6.18-rc7 |
|
| #
115b384c |
| 05-Sep-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
|
Revision tags: v2.6.18-rc6 |
|
| #
0a7d5f8c |
| 30-Aug-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.18-rc5 |
|
| #
8ce7a9c1 |
| 27-Aug-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
| #
ad73c67e |
| 07-Aug-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.18-rc4 |
|
| #
00dd7b7d |
| 06-Aug-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
show more ...
|
| #
d932cb7e |
| 04-Aug-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
36a2c6b2 |
| 03-Aug-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream-fixes' into upstream
|
| #
23946a8a |
| 03-Aug-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream-fixes' into upstream
|
| #
02b311bc |
| 02-Aug-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|
| #
ebf572b4 |
| 02-Aug-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into bcm43xx
|
| #
57cad808 |
| 31-Jul-2006 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
| #
bc65ac6a |
| 30-Jul-2006 |
Josh Triplett <josht@us.ibm.com> |
[PATCH] freevxfs: Add missing lock_kernel() to vxfs_readdir
Commit 7b2fd697427e73c81d5fa659efd91bd07d303b0e in the historical GIT tree
stopped calling the readdir member of a file_operations struct
[PATCH] freevxfs: Add missing lock_kernel() to vxfs_readdir
Commit 7b2fd697427e73c81d5fa659efd91bd07d303b0e in the historical GIT tree
stopped calling the readdir member of a file_operations struct with the big
kernel lock held, and fixed up all the readdir functions to do their own
locking. However, that change added calls to unlock_kernel() in
vxfs_readdir, but no call to lock_kernel(). Fix this by adding a call to
lock_kernel().
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1, 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 |
|
| #
95d465fd |
| 01-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 |
| 30-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 |
| 29-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
74d89c16 |
| 29-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
e02a4cab |
| 29-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
| #
bac30d1a |
| 28-Mar-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
c0e4077c |
| 28-Mar-2006 |
Jody McIntyre <scjody@modernduck.com> |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|