]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21eb218 39731b7)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jan 2014 20:39:56 +0000 (15:39 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jan 2014 20:39:56 +0000 (15:39 -0500)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/xmit.c patch | diff1 | diff2 | blob | history
net/mac80211/iface.c patch | diff1 | diff2 | blob | history

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