summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-09-04 13:12:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-04 13:12:02 -0400
commit1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (patch)
treee1de7780149aabc7e1559c8f79f333ed625d9f1a /net
parent190355cc06eb4b3e2d3f06a8f7ba5ea433d77998 (diff)
parentd88c8958dc13b4e4eb7fc57e3f06dc1c4abc7b1f (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions