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
..
interface	x86/xen: properly retrieve NMI reason	2015-01-13 09:39:50 +00:00
acpi.h
balloon.h
events.h	xen/events: support threaded irqs for interdomain event channels	2014-09-23 13:36:19 +00:00
features.h
grant_table.h	x86/xen: safely map and unmap grant frames when in atomic context	2014-07-30 14:22:47 +01:00
hvc-console.h
hvm.h
page.h	xen: add page_to_mfn()	2015-01-14 00:22:00 -05:00
platform_pci.h
swiotlb-xen.h
tmem.h
xen-ops.h	xen: Silence compiler warnings	2014-07-18 21:24:03 +01:00
xen.h
xenbus.h	xen: remove DEFINE_XENBUS_DRIVER() macro	2014-10-06 10:27:57 +01:00
xenbus_dev.h