summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-09-15 14:37:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-15 14:37:07 -0400
commiteb2eacf77ec4828c9a2e451b06bc6fc44266f4c0 (patch)
tree32d6aff5b5c67649e3ca81e0aa9322f206224aaf /net
parent167bf96dd87d2a8360cb9e9783006876dac4f579 (diff)
parentf991e17ba2584e2be66476cc468f19769efd55cc (diff)
downloadlinux-eb2eacf77ec4828c9a2e451b06bc6fc44266f4c0.tar.bz2
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions