David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -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
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
sock.c	Bluetooth: Remove unnecessary headers include	2012-06-05 06:34:08 +03:00