Roland Dreier fb1b5034e4 Merge branch 'ip-roce' into for-next ... Conflicts: drivers/infiniband/hw/mlx4/main.c		2014-01-22 23:24:21 -08:00
..
acpi	Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'	2013-12-31 22:03:37 +01:00
asm-generic	mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support	2013-12-20 12:17:03 -08:00
clocksource	…
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	drm/radeon: 0x9649 is SUMO2 not SUMO	2013-12-23 10:03:41 -05:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys	…
kvm	…
linux	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
math-emu	…
media	[media] videobuf2: Add support for file access mode flags for DMABUF exporting	2013-12-09 14:50:50 -02:00
memory	…
misc	…
net	sctp: Remove outqueue empty state	2014-01-02 17:22:48 -05:00
pcmcia	…
ras	…
rdma	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
rxrpc	…
scsi	scsi_transport_srp: Fix kernel-doc warnings	2014-01-21 10:46:17 -08:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-10 15:30:46 +01:00
target	target/file: Update hw_max_sectors based on current block_size	2013-12-19 00:18:54 -08:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-02 10:13:09 -08:00
uapi	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2014-01-01 11:36:16 -08:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Bug-fixes:	2013-12-20 09:34:54 -08:00
Kbuild	…