Linus Torvalds 4162cf6497 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: (67 commits) cxgb4vf: recover from failure in cxgb4vf_open() netfilter: ebtables: make broute table work again netfilter: fix race in conntrack between dump_table and destroy ah: reload pointers to skb data after calling skb_cow_data() ah: update maximum truncated ICV length xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC ehea: Increase the skb array usage net/fec: remove config FEC2 as it's used nowhere pcnet_cs: add new_id tcp: disallow bind() to reuse addr/port net/r8169: Update the function of parsing firmware net: ppp: use {get,put}_unaligned_be{16,32} CAIF: Fix IPv6 support in receive path for GPRS/3G arp: allow to invalidate specific ARP entries net_sched: factorize qdisc stats handling mlx4: Call alloc_etherdev to allocate RX and TX queues net: Add alloc_netdev_mqs function caif: don't set connection request param size before copying data cxgb4vf: fix mailbox data/control coherency domain race qlcnic: change module parameter permissions ...		2011-01-11 16:32:41 -08:00
..
accessibility
acpi	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
atm	Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.	2011-01-09 15:45:48 -08:00
auxdisplay
base	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-01-10 16:10:33 -08:00
block	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
bluetooth
cdrom	gdrom: don't use flush_scheduled_work()	2010-12-24 15:59:06 +01:00
char	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
clk
clocksource
connector
cpufreq	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
cpuidle	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
crypto
dca
dio
dma	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
edac	Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-01-07 14:54:03 -08:00
eisa
firewire	firewire: use split transaction timeout only for split transactions	2011-01-04 08:48:34 +01:00
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-01-10 17:11:39 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
hwmon	hwmon: Support for Dallas Semiconductor DS620	2011-01-09 09:10:10 -08:00
i2c	i2c: Constify i2c_client where possible	2011-01-10 22:11:23 +01:00
ide
idle	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-01-11 16:30:08 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
isdn	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
leds	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
lguest
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2010-12-20 09:19:46 -08:00
media	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
memstick
message
mfd	mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc	2011-01-08 23:52:31 -05:00
misc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	2011-01-11 11:01:24 -08:00
mtd	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2011-01-10 08:57:03 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-11 16:32:41 -08:00
nubus
of	Merge remote branch 'gcl/next' into next	2011-01-11 15:10:08 +11:00
oprofile
parisc
parport
pci	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	sony-laptop: support new hotkeys on the P, Z and EC series	2011-01-10 12:00:22 -05:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-01-11 16:31:41 -08:00
s390	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sbus	sparc: explicitly cast negative phandle checks to s32	2011-01-03 20:02:06 -07:00
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-01-10 08:22:33 -08:00
serial	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2011-01-10 17:06:08 -08:00
sfi
sh	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-01-10 08:14:53 -08:00
ssb	ssb: Use pci_is_pcie()	2010-12-22 15:43:26 -05:00
staging	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
uio
usb	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
uwb
vhost
video	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-01-10 16:04:53 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-11 11:02:13 -08:00
xen	Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-10 08:48:46 -08:00
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00