diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-04-22 20:56:41 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-22 20:56:41 +0200 |
commit | e563589f7187699b0217854467d857f53b29cc50 (patch) | |
tree | c6ff538f85ba5496da39b9d1789db761f58e803a /include/net/llc_s_st.h | |
parent | Merge tag 'nfc-next-3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | Bluetooth: Rename LE_SCANNING_* macros (diff) | |
download | linux-e563589f7187699b0217854467d857f53b29cc50.tar.xz linux-e563589f7187699b0217854467d857f53b29cc50.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/llc_s_st.h')
0 files changed, 0 insertions, 0 deletions