David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-26 16:37:08 -04:00
..
acpi	ACPI: Try harder to resolve _ADR collisions for bridges	2013-08-07 22:55:00 +02:00
asm-generic	Fix TLB gather virtual address range invalidation corner cases	2013-08-16 08:52:46 -07:00
clocksource
crypto
drm	drm: fix 64 bit drm fixed point helpers	2013-07-30 17:24:13 -04:00
dt-bindings	Pin control fixes for the v3.11 series:	2013-07-28 18:19:27 -07:00
keys
kvm	ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq	2013-06-26 10:50:02 -07:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
math-emu
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-16 15:37:26 -07:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
pcmcia
ras
rdma	Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next	2013-07-08 11:22:11 -07:00
rxrpc
scsi	[SCSI] libiscsi: Added new boot entries in the session sysfs	2013-06-26 18:04:11 -07:00
sound	ASoC: More updates for v3.11	2013-06-28 13:36:22 +02:00
target	target: make queue_tm_rsp() return void	2013-07-07 18:36:53 -07:00
trace	This contains fixes, optimizations and some clean ups	2013-07-22 19:07:24 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
xen	Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block	2013-07-22 19:02:52 -07:00
Kbuild