diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:50:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-05 15:50:22 -0500 |
| commit | 33b443422eda3828814e8c4b17cf4202ec6ac529 (patch) | |
| tree | 8bec6c2b851bc7924ff2ec26e08c5858cc4c51fd /net/nfc/nci | |
| parent | b476d3f143e8b213273834e92615370ca65ff126 (diff) | |
| parent | d78a32a8fcf775111ccc9ba611a08ca5c29784b6 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/nfc/nci')
0 files changed, 0 insertions, 0 deletions