| tag | fa041d45a8c8c3f51fed159b9cb256dc79dd2e05 | |
|---|---|---|
| tagger | John W. Linville <linville@tuxdriver.com> | Fri Apr 29 16:01:45 2011 -0400 |
| object | edf6a9f3d26d73a464944f877306d4bd7a3bea52 |
wireless-testing 2011-04-29
| commit | edf6a9f3d26d73a464944f877306d4bd7a3bea52 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Apr 29 15:53:06 2011 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Apr 29 15:53:06 2011 -0400 |
| tree | 29f87c2b186496ea2ea6c3d65cb229dada9bf067 | |
| parent | dad8ddb8ea49d85690de16d6a18aa9e72d42e973 [diff] | |
| parent | ff776cecec92fe7cac4a9ce1919576ad6e737e08 [diff] |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: net/bluetooth/l2cap_sock.c