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
..
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
core.c	Bluetooth: Fix style in hidp code	2012-06-09 19:22:42 -03:00
hidp.h	Bluetooth: Fix hidp disconnect deadlocks and lost wakeup	2011-06-30 15:47:50 -03:00
sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00