git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eccdf5 82e5fc2)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
1  2 
net/mac80211/status.c patch | diff1 | diff2 | blob | history
net/wireless/reg.c patch | diff1 | diff2 | blob | history

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