]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80b4573 5bd5e9a)
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 02:47:05 +0000 (13:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 02:47:05 +0000 (13:47 +1100)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c


Trivial merge
Linux kernel for KaRo TX COM modules