John W. Linville 95a943c162 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-15 10:05:24 -04:00

..

ath3k.c

Bluetooth: Add Atheros AR3012 one PID/VID supported

2011-07-01 14:48:02 -03:00

bcm203x.c

…

bfusb.c

…

bluecard_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

bpa10x.c

…

bt3c_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

btmrvl_debugfs.c

Bluetooth: Do not ignore errors returned from strict_strtol()

2011-06-10 15:04:41 -03:00

btmrvl_drv.h

…

btmrvl_main.c

…

btmrvl_sdio.c

…

btmrvl_sdio.h

…

btsdio.c

…

btuart_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

btusb.c

Bluetooth: Add Atheros AR3012 one PID/VID supported

2011-07-01 14:48:02 -03:00

btwilink.c

…

dtl1_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

hci_ath.c

…

hci_bcsp.c

…

hci_h4.c

…

hci_ldisc.c

Revert "tty: make receive_buf() return the amout of bytes received"

2011-06-04 06:33:24 +09:00

hci_ll.c

…

hci_uart.h

…

hci_vhci.c

…

Kconfig

…

Makefile

…