| commit | e11c259f745889b55bc5596ca78271f2f5cf08d2 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Nov 17 13:11:43 2011 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Nov 17 13:11:43 2011 -0500 |
| tree | 5025f0bf9093e84d0643beb9097249c176dbbea7 | |
| parent | 8d26784cf0d04c1238e906efdd5de76439cb0a1e [diff] | |
| parent | b4487c2d0edaf1332d7a9f11b5661044955ef5e2 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: include/net/bluetooth/bluetooth.h