]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2437f3c 73da7d5)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
1  2 
net/mac80211/cfg.c patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

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