diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-29 19:03:47 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-29 19:03:47 +0200 |
| commit | a5eb1aeb25df89c627248a162cc35ffb556dc486 (patch) | |
| tree | 934fd6b18f17f72d5e57708b8e3a12b0071f1327 /kernel/smpboot.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (diff) | |
| parent | Bluetooth: Clearly distinguish mgmt LTK type from authenticated property (diff) | |
| download | linux-a5eb1aeb25df89c627248a162cc35ffb556dc486.tar.xz linux-a5eb1aeb25df89c627248a162cc35ffb556dc486.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Conflicts:
drivers/bluetooth/btusb.c
Diffstat (limited to 'kernel/smpboot.c')
0 files changed, 0 insertions, 0 deletions