projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0d8165e9fca119b804de2cf35674e07c36c9704f
tree3d66d027b502b6fdb98666a9121c7f52b48c657dtree | snapshot
parent4c9d546f6c522f541dfb01e192ab7101eca0053bcommit | diff
parent076f0d20b636ef0e701e21e701c0631b5757b732commit | diff
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
MAINTAINERS diff1 | diff2 | blob | history
include/linux/ieee80211.h diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
include/net/mac80211.h diff1 | diff2 | blob | history
John Crispins staging tree