linux/arch/arm/include
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
..
asm arm: sa1100: move irda header to linux/platform_data 2014-12-30 18:44:07 -05:00
debug ARM: add lolevel debug support for asm9260 2014-11-28 15:08:06 +01:00
uapi/asm ARM: wire up execveat syscall 2015-01-07 20:31:54 +00:00