diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-18 13:46:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-18 13:46:08 -0500 |
| commit | b7e047358449f8eb5cba8197b42280b676b82e54 (patch) | |
| tree | 88174a5fa109cb71eee4dd6413e35c7412095769 /net/nfc | |
| parent | 73f0b56a1ff64e7fb6c3a62088804bab93bcedc2 (diff) | |
| parent | 1bc5ad168f441f6f8bfd944288a5f7b4963ac1f6 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions