| commit | 49c87cd1eac1f798c5bad7f7eb809e6df36b6c56 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Mar 18 09:39:21 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Mar 18 09:39:21 2013 -0400 |
| tree | 8d6905466a05d6539e06d189cf88b71095ac0a79 | |
| parent | 4969b41798e512689bba57c8c44d873216eba814 [diff] | |
| parent | 9437a248e7cac427c898bdb11bd1ac6844a1ead4 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless Conflicts: net/nfc/llcp/llcp.c