Linus Torvalds 1c1ee4c3e7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits) [XFRM]: Allow packet drops during larval state resolution. [CASSINI]: Check pci_set_mwi() return value. [NET]: "wrong timeout value" in sk_wait_data() v2 [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access [NETFILTER]: nf_conntrack_h323: fix ASN.1 types [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update [NET_SCHED]: sch_htb: fix event cache time calculation [DCCP]: Fix build warning when debugging is disabled. [TIPC]: Fixed erroneous introduction of for_each_netdev [RTNETLINK]: Fix sending netlink message when replace route. [TR]: Use menuconfig objects. [ARCNET]: Use menuconfig objects. [TIPC]: Use menuconfig objects. [SCTP]: Use menuconfig objects. [IPVS]: Use menuconfig objects. [DCCP]: Use menuconfig objects. ...		2007-05-24 18:41:28 -07:00
..
acpi	acpi: fix potential call to a freed memory section.	2007-05-17 05:23:04 -07:00
asm-alpha	alpha: fix hard_smp_processor_id compile error	2007-05-15 08:54:00 -07:00
asm-arm	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2007-05-21 10:00:22 -07:00
asm-arm26	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-avr32	[AVR32] Implement platform hooks for atmel_lcdfb driver	2007-05-15 14:13:27 +02:00
asm-blackfin	Blackfin arch: Change NO_ACCESS_CHECK to ACCESS_CHECK	2007-05-21 09:50:23 -07:00
asm-cris	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-frv	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-generic	Don't call a warnign a bug. It's a warning.	2007-05-24 10:13:43 -07:00
asm-h8300	h8300 atomic.h update	2007-05-15 08:54:00 -07:00
asm-i386	i386: fix early usage of atomic_add_return and local_add_return on real i386	2007-05-23 20:14:15 -07:00
asm-ia64	[IA64] Cleanup acpi header to reuse the generic _PDC defines	2007-05-24 10:15:06 -07:00
asm-m32r	m32r: __xchg() should be always_inline	2007-05-15 18:56:37 -07:00
asm-m68k	m68k: implement __clear_user()	2007-05-15 08:54:00 -07:00
asm-m68knommu	…
asm-mips	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00
asm-parisc	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00
asm-powerpc	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00
asm-ppc	Merge branch 'linux-2.6'	2007-05-10 21:08:37 +10:00
asm-s390	[S390] Wire up signald, timerfd and eventfd syscalls.	2007-05-21 11:25:28 +02:00
asm-sh	sh: Fix dreamcast build for IRQ changes.	2007-05-21 15:10:04 +09:00
asm-sh64	sh64: generic quicklist support.	2007-05-14 09:55:35 +09:00
asm-sparc	[SPARC32]: asm/system.h needs asm/smp.h	2007-05-14 03:53:47 -07:00
asm-sparc64	[SPARC64]: Add hypervisor API negotiation and fix console bugs.	2007-05-15 20:23:02 -07:00
asm-um	uml: iRQ stacks	2007-05-11 08:29:34 -07:00
asm-v850	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
asm-x86_64	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00
asm-xtensa	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
crypto	…
keys	…
linux	[NETFILTER]: nf_conntrack_h323: fix ASN.1 types	2007-05-24 16:42:26 -07:00
math-emu	…
media	…
mtd	…
net	[XFRM]: Allow packet drops during larval state resolution.	2007-05-24 18:17:54 -07:00
pcmcia	…
rdma	Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband	2007-05-21 16:19:32 -07:00
rxrpc	…
scsi	…
sound	[ALSA] version 1.0.14rc4	2007-05-16 11:45:47 +02:00
video	atmel_lcdfb: AT91/AT32 LCD Controller framebuffer driver	2007-05-11 08:29:37 -07:00
Kbuild	…