summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-03-04 13:34:08 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-03-04 13:34:08 -0500
commit9b8ba9f518829f7b7776e3b1f8c9f83c9696cf28 (patch)
treef278b61c99f3b8a92bedf23d55f52127da8657d8 /net
parentb6251243ac0a3cb63afe748133f6600f77526078 (diff)
parentacfcd9ed588465e48efe5ceb67177096d51c95a9 (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