David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
configs	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
gxio	arch/tile: provide kernel support for the tilegx USB shim	2012-07-18 16:40:24 -04:00
include	tile: gxio iorpc numbering change for TRIO interface	2012-09-24 15:11:53 -04:00
kernel	tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e	2012-07-25 18:22:46 -04:00
kvm	virtio: expose for non-virtualization users too	2011-07-23 16:20:30 +09:30
lib	arch/tile: break out the "csum a long" function to <asm/checksum.h>	2012-07-11 16:04:57 -04:00
mm	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-07-27 11:26:48 -07:00
Kbuild	arch/tile: core support for Tilera 32-bit chips.	2010-06-04 17:11:18 -04:00
Kconfig	bounce: allow use of bounce pool via config option	2012-07-18 16:40:35 -04:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	arch/tile: introduce GXIO IORPC framework for tilegx	2012-07-11 16:04:52 -04:00