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

Conflicts:

	drivers/net/s2io.c

2008-04-02 22:35:23 -07:00

..

bnep

…

cmtp

…

hidp

…

rfcomm

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

2008-04-02 22:35:23 -07:00

af_bluetooth.c

bluetooth : use lockdep sub-classes for diffrent bluetooth protocol

2008-04-01 23:58:35 -07:00

hci_conn.c

…

hci_core.c

…

hci_event.c

…

hci_sock.c

…

hci_sysfs.c

…

Kconfig

…

l2cap.c

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

2008-04-02 22:35:23 -07:00

lib.c

…

Makefile

…

sco.c

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

2008-04-02 22:35:23 -07:00