diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-19 14:38:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-19 14:38:12 -0500 |
| commit | 65210946f31007d12efcf66586fdcaf6ff3fa8f9 (patch) | |
| tree | 08cb1916a8de38f5b4e3a72973f7694df218d98c /drivers/nfc | |
| parent | e56108d92760c89ce21c30aa02588595b9396251 (diff) | |
| parent | e1b69fdf33f63cfa600b992172d7376f9d9ef2e9 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions