David S. Miller 6332178d91 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/ppp_generic.c

2008-12-23 17:56:23 -08:00

..

bnep

…

cmtp

…

hidp

…

rfcomm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-12-23 17:56:23 -08:00

af_bluetooth.c

…

hci_conn.c

…

hci_core.c

…

hci_event.c

…

hci_sock.c

…

hci_sysfs.c

…

Kconfig

…

l2cap.c

…

lib.c

…

Makefile

…

sco.c

…