]> 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: 931cb03 88a9e31)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)

Trivial merge
Linux kernel for KaRo TX COM modules