| #
bef98650 |
| 08-Dec-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
|
| #
21b4e736 |
| 07-Dec-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
|
| #
8210fd2a |
| 07-Dec-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: use get_random_bytes() after random pool is seeded
When the UML network driver generates random MACs for its devices, it was
possible for a number of UMLs to get the same MACs because t
[PATCH] uml: use get_random_bytes() after random pool is seeded
When the UML network driver generates random MACs for its devices, it was
possible for a number of UMLs to get the same MACs because the ethernet
initialization was done before the random pool was properly seeded.
This patch moves the initialization later so that it gets better randomness.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
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 |
|
| #
8a84fc15 |
| 01-Oct-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
|
| #
185a257f |
| 28-Sep-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master' into gfs2
|
| #
3b9f6cb8 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
aebb1153 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
5e7672ec |
| 27-Sep-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: const more data
Make lots of structures const in order to make it obvious that they need no
locking.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <bl
[PATCH] uml: const more data
Make lots of structures const in order to make it obvious that they need no
locking.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: 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, v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2 |
|
| #
f1f76afd |
| 19-Apr-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
| #
875999c5 |
| 12-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
76467874 |
| 03-Apr-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
|
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
|
| #
6e07e164 |
| 01-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
| #
f4c57a78 |
| 31-Mar-2006 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: fix initcall return values
A number of UML initcalls were improperly returning 1. Also removed any
nearby emacs formatting comments.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: P
[PATCH] uml: fix initcall return values
A number of UML initcalls were improperly returning 1. Also removed any
nearby emacs formatting comments.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
| #
b0500577 |
| 21-Mar-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Res
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
show more ...
|
|
Revision tags: v2.6.16 |
|
| #
c5111f50 |
| 15-Mar-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
|
Revision tags: v2.6.16-rc6, v2.6.16-rc5 |
|
| #
fab8d6dd |
| 24-Feb-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /home/src/linux-2.6/
|
| #
d35462b4 |
| 23-Feb-2006 |
Steven Whitehouse <steve@men-an-tol.chygwyn.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.16-rc4, v2.6.16-rc3 |
|
| #
9caafa6c |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
99b3738f |
| 09-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
8f75015f |
| 07-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
|
| #
3c9b3a85 |
| 07-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
6cb6524d |
| 07-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
b2faf597 |
| 06-Feb-2006 |
Mauro Carvalho Chehab <mchehab@infradead.org> |
Merge branch 'origin'
|
| #
01d206a7 |
| 03-Feb-2006 |
Adrian Bunk <bunk@stusta.de> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|