summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-01-06 14:20:07 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-01-06 14:20:07 -0500
commite46316c86ee6a5e8909fa228455f9cf1dbee6957 (patch)
tree50aab5930d1c9c2f8574be004e7aeac1141db64f /net
parenta50f9d5ee0f81271be49d64801bee0dfe84c2127 (diff)
parentefc5520c4224479967b7381775a63fb48283b082 (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