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

..

core.c

net: return operator cleanup

2010-09-23 14:33:39 -07:00

Kconfig

…

Makefile

…

sock.c

Bluetooth: Fix inconsistent lock state with RFCOMM

2010-09-30 12:19:35 -03:00

tty.c

Bluetooth: Remove __exit from rfcomm_cleanup_ttys()

2010-07-31 16:09:21 -07:00