Linus Torvalds 2284284281 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netns: fix ip_rt_frag_needed rt_is_expired netfilter: nf_conntrack_extend: avoid unnecessary "ct->ext" dereferences netfilter: fix double-free and use-after free netfilter: arptables in netns for real netfilter: ip{,6}tables_security: fix future section mismatch selinux: use nf_register_hooks() netfilter: ebtables: use nf_register_hooks() Revert "pkt_sched: sch_sfq: dump a real number of flows" qeth: use dev->ml_priv instead of dev->priv syncookies: Make sure ECN is disabled net: drop unused BUG_TRAP() net: convert BUG_TRAP to generic WARN_ON drivers/net: convert BUG_TRAP to generic WARN_ON		2008-07-26 20:17:56 -07:00
..
block	[S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP	2008-07-17 17:22:10 +02:00
char	device create: s390: convert device_create to device_create_drvdata	2008-07-21 21:54:44 -07:00
cio	[S390] qdio: new qdio driver.	2008-07-17 17:22:10 +02:00
crypto	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
kvm	virtio: Add transport feature handling stub for virtio_ring.	2008-07-25 12:06:14 +10:00
net	qeth: use dev->ml_priv instead of dev->priv	2008-07-26 02:24:10 -07:00
scsi	[S390] qdio: new qdio driver.	2008-07-17 17:22:10 +02:00
ebcdic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	s390: KVM guest: virtio device support, and kvm hypercalls	2008-04-27 12:00:51 +03:00
s390_rdev.c	[PATCH] s390: kzalloc() conversion in drivers/s390	2006-03-24 07:33:18 -08:00
s390mach.c	[S390] stp support.	2008-07-14 10:02:09 +02:00
s390mach.h	[S390] stp support.	2008-07-14 10:02:09 +02:00
sysinfo.c	[S390] Add new fields for System z10 to /proc/sysinfo	2008-04-17 07:47:01 +02:00