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

..

bnep

…

cmtp

…

hidp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-06-28 17:37:00 -07:00

rfcomm

Merge tty-next into 3.6-rc1

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

a2mp.c

Bluetooth: debug: Print amp_mgr refcnt

2012-07-11 10:09:37 -03:00

af_bluetooth.c

…

hci_conn.c

Bluetooth: Route traffic only through BR/EDR controller

2012-06-30 12:15:32 -03:00

hci_core.c

Bluetooth: debug: Add printing num of cmds queued

2012-07-10 15:35:27 -03:00

hci_event.c

Bluetooth: debug: Use standard hex object specifiers in hci_event

2012-07-11 09:56:03 -03:00

hci_sock.c

…

hci_sysfs.c

…

Kconfig

…

l2cap_core.c

Bluetooth: Use tx window from config response for ack timing

2012-07-15 12:18:29 -03:00

l2cap_sock.c

…

lib.c

…

Makefile

…

mgmt.c

Bluetooth: Change page scan interval in fast connectable mode

2012-07-16 10:50:11 -03:00

sco.c

…

smp.c

…