Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ...

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-08-06 09:48:31 -07:00

..

ath3k.c

Bluetooth: add support for atheros 0930:0219

2012-06-11 23:54:33 -03:00

bcm203x.c

USB: Disable hub-initiated LPM for comms devices.

2012-05-18 15:42:55 -07:00

bfusb.c

USB: Disable hub-initiated LPM for comms devices.

2012-05-18 15:42:55 -07:00

bluecard_cs.c

Bluetooth: bluecard_cs: Shorten scope for iobase

2012-06-30 12:33:06 -03:00

bpa10x.c

Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSE

2012-06-05 06:34:06 +03:00

bt3c_cs.c

Bluetooth: Fix warning: using int as NULL pointer

2012-06-30 12:07:14 -03:00

btmrvl_debugfs.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

btmrvl_drv.h

Bluetooth: btmrvl: Do not send vendor events to bluetooth stack

2012-06-19 00:19:11 -03:00

btmrvl_main.c

Bluetooth: btmrvl: trivial style fixes

2012-07-09 09:45:10 -03:00

btmrvl_sdio.c

Bluetooth: btmrvl: trivial style fixes

2012-07-09 09:45:10 -03:00

btmrvl_sdio.h

Bluetooth: btmrvl: support Marvell Bluetooth device SD8787

2011-04-13 12:20:05 -03:00

btsdio.c

Bluetooth: Remove hci_dev->driver_data

2012-02-13 17:01:37 +02:00

btuart_cs.c

Bluetooth: Fix warning: using int as NULL pointer

2012-06-30 12:07:14 -03:00

btusb.c

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2012-06-26 08:36:30 -07:00

btwilink.c

Bluetooth: Remove hci_dev->driver_data

2012-02-13 17:01:37 +02:00

dtl1_cs.c

Bluetooth: cleanup dtl1_config

2012-06-30 11:44:36 -03:00

hci_ath.c

tty: move the termios object into the tty

2012-07-16 13:00:41 -07:00

hci_bcsp.c

Bluetooth: Remove 'register' usage from the subsystem

2012-06-05 06:34:07 +03:00

hci_h4.c

Bluetooth: Remove 'register' usage from the subsystem

2012-06-05 06:34:07 +03:00

hci_h5.c

Bluetooth: Introduce a flags variable to Three-wire UART state

2012-07-17 14:49:24 -03:00

hci_ldisc.c

Bluetooth: Add delayed init sequence support for UART controllers

2012-07-17 14:48:29 -03:00

hci_ll.c

Bluetooth: Remove 'register' usage from the subsystem

2012-06-05 06:34:07 +03:00

hci_uart.h

Bluetooth: Add delayed init sequence support for UART controllers

2012-07-17 14:48:29 -03:00

hci_vhci.c

Bluetooth: vhci: Ignore return code of nonseekable_open()

2012-05-09 00:41:36 -03:00

Kconfig

Bluetooth: Initial skeleton for Three-wire UART (H5) support

2012-07-17 14:33:20 -03:00

Makefile

Bluetooth: Initial skeleton for Three-wire UART (H5) support

2012-07-17 14:33:20 -03:00