projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c9d546 076f0d2)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Aug 2013 18:08:24 +0000 (14:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Aug 2013 18:08:24 +0000 (14:08 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
include/linux/ieee80211.h patch | diff1 | diff2 | blob | history
include/net/cfg80211.h patch | diff1 | diff2 | blob | history
include/net/mac80211.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/ieee80211.h
Simple merge
diff --cc include/net/cfg80211.h
Simple merge
diff --cc include/net/mac80211.h
Simple merge
Domain: System / Kernel;