aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJohn W. Linville2013-01-07 14:57:43 -0500
committerJohn W. Linville2013-01-07 14:57:43 -0500
commit48c6cc04c9ce5c38c76304377f6f7e5b1e98ca47 (patch)
treec91096cfecc226413d4d702f52c71ef6152223df /include/linux
parentba23d2068d85f6616ea5f92320c04e87d4b9e141 (diff)
parentabae2386d55aff1d395cdb665f03684c227a6a69 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions