Linus Torvalds d7fc02c7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits) mac80211: fix reorder buffer release iwmc3200wifi: Enable wimax core through module parameter iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter iwmc3200wifi: Coex table command does not expect a response iwmc3200wifi: Update wiwi priority table iwlwifi: driver version track kernel version iwlwifi: indicate uCode type when fail dump error/event log iwl3945: remove duplicated event logging code b43: fix two warnings ipw2100: fix rebooting hang with driver loaded cfg80211: indent regulatory messages with spaces iwmc3200wifi: fix NULL pointer dereference in pmkid update mac80211: Fix TX status reporting for injected data frames ath9k: enable 2GHz band only if the device supports it airo: Fix integer overflow warning rt2x00: Fix padding bug on L2PAD devices. WE: Fix set events not propagated b43legacy: avoid PPC fault during resume b43: avoid PPC fault during resume tcp: fix a timewait refcnt race ... Fix up conflicts due to sysctl cleanups (dead sysctl_check code and CTL_UNNUMBERED removed) in kernel/sysctl_check.c net/ipv4/sysctl_net_ipv4.c net/ipv6/addrconf.c net/sctp/sysctl.c		2009-12-08 07:55:01 -08:00
..
block	[S390] dasd: use idal for device characteristics	2009-10-14 12:43:53 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
cio	[S390] cio: change misleading console logic	2009-10-14 12:43:53 +02:00
crypto	[S390] zcrypt: Improve some comments	2009-10-06 10:35:09 +02:00
kvm	[S390] kvm: use console_initcall() to initialize s390 virtio console	2009-09-11 10:29:52 +02:00
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
scsi	[SCSI] zfcp: Flush SCSI registration work when adding unit	2009-10-22 09:38:51 +09:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00