aboutsummaryrefslogtreecommitdiff
path: root/drivers/parisc
diff options
context:
space:
mode:
authorJohn W. Linville2013-06-12 15:12:41 -0400
committerJohn W. Linville2013-06-12 15:12:41 -0400
commitcb180840a0c6bff7c0787373c23cefdf20417a27 (patch)
treeb291b4df78fe08c35297271163b71fd86350a53c /drivers/parisc
parent5631becbb8703d73239e097d222b183aa4f24e40 (diff)
parent8eb3871076875f247483f4a1fe6713e6d440c53e (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/parisc')
0 files changed, 0 insertions, 0 deletions