projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b34f40 1724ffb)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:52:04 +0000 (14:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:52:04 +0000 (14:52 -0400)
1  2 
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history
net/mac80211/util.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/mlme.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge
Domain: System / Uncategorized;