| #
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>
|
| #
11ed56fb |
| 24-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
|
| #
1ebbe2b2 |
| 23-Mar-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'linus'
|
| #
b4d8d1a9 |
| 23-Mar-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
74293759 |
| 23-Mar-2006 |
Anton Altaparmakov <aia21@hera.kernel.org> |
Merge branch 'master' of /home/aia21/ntfs-2.6/
|
| #
5501972e |
| 22-Mar-2006 |
Jaroslav Kysela <perex@suse.cz> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
4d74f423 |
| 21-Mar-2006 |
Nathan Scott <nathans@bruce> |
Merge HEAD from ../linux-2.6
|
| #
d04cdb64 |
| 21-Mar-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
| #
3d1f337b |
| 21-Mar-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
[NETFILTER]: Add H.323 conntrack/NAT helper
[TG3]: Don'
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
[NETFILTER]: Add H.323 conntrack/NAT helper
[TG3]: Don't mark tg3_test_registers() as returning const.
[IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
[IPV6]: Cleanup of net/ipv6/reassambly.c
[BRIDGE]: Remove duplicate const from is_link_local() argument type.
[DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
[TG3]: make drivers/net/tg3.c:tg3_request_irq() static
[BRIDGE]: use LLC to send STP
[LLC]: llc_mac_hdr_init const arguments
[BRIDGE]: allow show/store of group multicast address
[BRIDGE]: use llc for receiving STP packets
[BRIDGE]: stp timer to jiffies cleanup
[BRIDGE]: forwarding remove unneeded preempt and bh diasables
[BRIDGE]: netfilter inline cleanup
[BRIDGE]: netfilter VLAN macro cleanup
[BRIDGE]: netfilter dont use __constant_htons
[BRIDGE]: netfilter whitespace
[BRIDGE]: optimize frame pass up
[BRIDGE]: use kzalloc
...
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 ...
|
| #
0c600eda |
| 21-Mar-2006 |
Ingo Oeser <ioe-lkml@rameria.de> |
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
Stupidly use kzalloc() instead of kmalloc()/memset()
everywhere where this is possible in net/ipv6/*.c .
Signed-off-by: Ingo Oeser <ioe-lkml@ram
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
Stupidly use kzalloc() instead of kmalloc()/memset()
everywhere where this is possible in net/ipv6/*.c .
Signed-off-by: Ingo Oeser <ioe-lkml@rameria.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
| #
9500e8a8 |
| 20-Mar-2006 |
Jamal Hadi Salim <hadi@cyberus.ca> |
[IPSEC]: Sync series - fast path
Fast path sequence updates that will generate ipsec async
events
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.n
[IPSEC]: Sync series - fast path
Fast path sequence updates that will generate ipsec async
events
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
| #
1a02e59a |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master'
|
| #
9a212471 |
| 20-Mar-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
| #
0f76ee45 |
| 20-Mar-2006 |
Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
fd4a0b92 |
| 20-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>
|
| #
61c5504a |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master'
|
|
Revision tags: v2.6.16 |
|
| #
23dd6401 |
| 16-Mar-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6
|
| #
abc71c46 |
| 16-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream-fixes'
|
| #
6e48f1b7 |
| 16-Mar-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
| #
dd288e7d |
| 15-Mar-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'upstream-fixes'
|
| #
c5111f50 |
| 14-Mar-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
f33b5d78 |
| 14-Mar-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
| #
58a343f2 |
| 13-Mar-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
f8dc01f5 |
| 12-Mar-2006 |
Patrick McHardy <kaber@trash.net> |
[XFRM]: Fix leak in ah6_input
tmp_hdr is not freed when ipv6_clear_mutable_options fails.
Coverity #650
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davem
[XFRM]: Fix leak in ah6_input
tmp_hdr is not freed when ipv6_clear_mutable_options fails.
Coverity #650
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|