Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

Browse source

...

This commit is contained in:

David S. Miller 2009-05-16 13:46:06 -07:00

parent 542cc7937e 3d7a9d1c7e

commit 17e4d43eb6

3 changed files with 7 additions and 4 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

2

net/bluetooth/hci_event.c

View file

3

net/bluetooth/hci_sysfs.c

View file