| commit | 4b42c542afbc119c4012324ea80e0c5a89afea4f | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jul 11 14:58:22 2011 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jul 11 14:58:22 2011 -0400 |
| tree | a67a788c7ba06cb40219b49505f84594dabc6f82 | |
| parent | d8598981146241064993e371cea8333f59553cb6 [diff] | |
| parent | e2fd318e3a9208245ee1041f6d413c8593fba29d [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 Conflicts: net/bluetooth/l2cap_core.c