Linus Torvalds 85a331881d 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: (27 commits) net: clear heap allocation for ETHTOOL_GRXCLSRLALL isdn: strcpy() => strlcpy() Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath" mac80211: delete AddBA response timer ath9k_hw: fix regression in ANI listen time calculation caif: fix two caif_connect() bugs bonding: fix WARN_ON when writing to bond_master sysfs file skge: add quirk to limit DMA MAINTAINERS: update Intel LAN Ethernet info e1000e.txt: Add e1000e documentation e1000.txt: Update e1000 documentation ixgbevf.txt: Update ixgbevf documentation cls_u32: signedness bug Bluetooth: Disallow to change L2CAP_OPTIONS values when connected sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac() sctp: prevent reading out-of-bounds memory ipv4: correct IGMP behavior on v3 query during v2-compatibility mode netdev: Depend on INET before selecting INET_LRO Revert "ipv4: Make INET_LRO a bool instead of tristate." net: Fix the condition passed to sk_wait_event() ...		2010-10-09 12:06:26 -07:00
..
acpi	ACPI: Fix typos	2010-09-28 21:38:19 -04:00
asm-generic	gpio: doc updates	2010-09-09 18:57:24 -07:00
crypto
drm	drm/ttm: Fix two race conditions + fix busy codepaths	2010-10-06 09:04:43 +10:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	elevator: fix oops on early call to elevator_change()	2010-10-07 09:35:16 +02:00
math-emu
media	V4L/DVB: videobuf-dma-sg: set correct size in last sg element	2010-09-27 22:22:01 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	Bluetooth: Fix deadlock in the ERTM logic	2010-09-30 12:19:35 -03:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound	ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)	2010-08-18 15:10:59 +02:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-24 12:21:49 -07:00
video	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild