David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 00:53:17 -05:00
..
acpi	ACPI / processor: Convert apic_id to phys_id to make it arch agnostic	2015-01-05 23:32:42 +01:00
asm-generic	mm: mmu_gather: use tlb->end != 0 only for TLB invalidation	2015-01-13 15:20:40 +13:00
clocksource	time: move the timecounter/cyclecounter code into its own file.	2014-12-30 18:29:25 -05:00
crypto
drm	Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"	2014-12-24 13:13:22 +10:00
dt-bindings	GMAC: define clock ID used for GMAC	2014-12-31 19:14:18 -05:00
keys
kvm	arm/arm64: KVM: Require in-kernel vgic for the arch timers	2014-12-15 11:50:42 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
math-emu
media
memory
misc
net	vxlan: Remote checksum offload	2015-01-14 15:20:04 -05:00
pcmcia
ras
rdma	IB/core: Implement support for MMU notifiers regarding on demand paging regions	2014-12-15 18:13:36 -08:00
rxrpc
scsi	SCSI for-linus on 20141220	2014-12-20 13:42:57 -08:00
soc	Merge branch 'at91/cleanup5' into next/drivers	2014-12-08 18:29:20 +01:00
sound	ALSA: pcm: Fix kerneldoc for params_*() functions	2014-12-30 16:41:11 +01:00
target	target: Drop left-over fabric_max_sectors attribute	2015-01-09 15:22:05 -08:00
trace	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
video
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
Kbuild