davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ec7c35b852
kernel-ark/drivers/bluetooth
History
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
2008-10-13 14:12:40 -07:00
..
bcm203x.c [Bluetooth] Removal of unnecessary ignore module parameter 2008-08-07 22:26:55 +02:00
bfusb.c [Bluetooth] Removal of unnecessary ignore module parameter 2008-08-07 22:26:55 +02:00
bluecard_cs.c pcmcia: deprecate CS_SUCCESS 2008-08-23 02:29:26 +02:00
bpa10x.c [Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers 2008-10-06 12:22:51 +02:00
bt3c_cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2008-10-13 14:12:40 -07:00
btsdio.c drivers/bluetooth/btsdio.c: fix double-free 2008-02-05 03:09:17 -08:00
btuart_cs.c pcmcia: deprecate CS_SUCCESS 2008-08-23 02:29:26 +02:00
btusb.c [Bluetooth] Add reset quirk for A-Link BlueUSB21 dongle 2008-10-06 12:22:52 +02:00
dtl1_cs.c pcmcia: deprecate CS_SUCCESS 2008-08-23 02:29:26 +02:00
hci_bcsp.c bluetooth: hci_bcsp: Use SKB list interfaces instead of home-grown stuff. 2008-09-21 22:44:08 -07:00
hci_h4.c
hci_ldisc.c tty: some ICANON magic is in the wrong places 2008-10-13 09:51:44 -07:00
hci_ll.c [BLUETOOTH]: Always send explicit hci_ll wake-up acks. 2008-01-10 22:24:43 -08:00
hci_uart.h [Bluetooth] Add UART driver for Texas Instruments' BRF63xx chips 2007-10-22 02:59:44 -07:00
hci_usb.c [Bluetooth] Consolidate maintainers information 2008-08-18 13:23:53 +02:00
hci_usb.h hci_usb: replace mb with smp_mb 2008-09-22 19:21:51 -07:00
hci_vhci.c [Bluetooth] Consolidate maintainers information 2008-08-18 13:23:53 +02:00
Kconfig [Bluetooth] Add SCO support to btusb driver 2008-08-18 13:23:52 +02:00
Makefile [Bluetooth] Add generic driver for Bluetooth USB devices 2007-10-22 02:59:46 -07:00