David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/firmware/iscsi_ibft.c

2010-02-28 19:23:06 -08:00

..

bnep

…

cmtp

…

hidp

…

rfcomm

…

af_bluetooth.c

…

hci_conn.c

…

hci_core.c

Bluetooth: Add controller types for BR/EDR and 802.11 AMP

2010-02-27 14:05:38 +01:00

hci_event.c

Bluetooth: Add SCO fallback for unsupported feature error

2010-02-27 14:06:00 +01:00

hci_sock.c

Bluetooth: Fix out of scope variable access in hci_sock_cmsg()

2010-02-28 00:47:30 -08:00

hci_sysfs.c

Bluetooth: Add controller types for BR/EDR and 802.11 AMP

2010-02-27 14:05:38 +01:00

Kconfig

…

l2cap.c

…

lib.c

…

Makefile

…

sco.c

…