]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f89ff64 6dbda2d)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:14:48 +0000 (14:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:14:48 +0000 (14:14 -0400)
1  2 
net/mac80211/util.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/util.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.