| commit | 0b5fcba7d52401bc30aac090d7dad264018eafd1 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed May 02 11:22:39 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed May 02 11:22:39 2012 -0400 |
| tree | 5b33e4a2d71af16cd916e17e2c315729202d0af6 | |
| parent | 319006eaac431abeb72c1377bc5b7460e510c9a3 [diff] | |
| parent | 66f2c99af3d6f2d0aa1120884cf1c60613ef61c0 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless Conflicts: net/bluetooth/hci_core.c net/bluetooth/mgmt.c