]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b12f62e e29ec62)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2011 21:22:15 +0000 (16:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2011 21:22:15 +0000 (16:22 -0500)
1  2 
drivers/net/wireless/ath/regd.c patch | diff1 | diff2 | blob | history
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/regd.c
Simple merge
diff --cc net/mac80211/mlme.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.