]> 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: 8f7b8db 3a40414)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 17 Oct 2012 20:23:33 +0000 (16:23 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 17 Oct 2012 20:23:33 +0000 (16:23 -0400)
1  2 
net/mac80211/wpa.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/wpa.c
Simple merge
Linux kernel for KaRo TX COM modules