Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Browse source

Conflicts:
	net/bluetooth/l2cap_core.c

...

This commit is contained in:

Gustavo F. Padovan 2011-06-21 14:52:56 -03:00

parent e13e21dc5d 330605423c

commit 0555891184

2 changed files with 19 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

net/bluetooth/hci_conn.c

View file

23

net/bluetooth/l2cap_core.c

View file