summaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_mgmt.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-19 20:24:45 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-08-19 20:24:45 +0200
commit22f0d2d1e7e76758f75887e616f2976323f85c26 (patch)
tree9470a4a7f4fe9deac91bd5bba2dbd9bfd6e7c84d /net/netlabel/netlabel_mgmt.c
parentMerge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (diff)
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff)
downloadlinux-22f0d2d1e7e76758f75887e616f2976323f85c26.tar.xz
linux-22f0d2d1e7e76758f75887e616f2976323f85c26.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/netlabel/netlabel_mgmt.c')
0 files changed, 0 insertions, 0 deletions