summaryrefslogtreecommitdiff
path: root/net/bluetooth/bnep
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-23 15:41:46 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2012-10-23 15:41:46 (GMT)
commit9b34f40c20111ba658f88e1669598db494be1fbc (patch)
treebe98189b178ca63a44c09c8a5e92574a92932b51 /net/bluetooth/bnep
parent9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563 (diff)
parent290eddc4b3661dc4dfa95d199e0be5788928b3b1 (diff)
downloadlinux-fsl-qoriq-9b34f40c20111ba658f88e1669598db494be1fbc.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c net/mac80211/mlme.c
Diffstat (limited to 'net/bluetooth/bnep')
0 files changed, 0 insertions, 0 deletions