| commit | 161ae88744bdcef15058a38f101b06308d8824d4 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jun 26 14:23:41 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jun 26 14:23:41 2012 -0400 |
| tree | f54e83949b47bd6976d57afde9a5ea79801b0395 | |
| parent | eac9ac6d1f5d0e9d33e4ded682187b630e7606cd [diff] | |
| parent | 03e934f620101ca2cfc9383bd76172dd3e1f8567 [diff] |
Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0