David S. Miller d122179a3c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/core/ethtool.c		2010-10-11 12:30:34 -07:00
..
bluetooth.h	Bluetooth: Fix deadlock in the ERTM logic	2010-09-30 12:19:35 -03:00
hci.h	Bluetooth: Use __packed annotation	2010-07-21 10:39:13 -07:00
hci_core.h	net: return operator cleanup	2010-09-23 14:33:39 -07:00
l2cap.h	net: return operator cleanup	2010-09-23 14:33:39 -07:00
rfcomm.h	Bluetooth: Use __packed annotation	2010-07-21 10:39:13 -07:00
sco.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00