git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 92fe728 a5d7c64)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 29 Aug 2013 18:08:24 +0000 (14:08 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 29 Aug 2013 18:08:24 +0000 (14:08 -0400)
commit	014b9d0e7959cb61b400d282bedf30cb24f7d4f1
tree	3d66d027b502b6fdb98666a9121c7f52b48c657d	tree \| snapshot
parent	92fe728f7c347078e3196852dbe8dc1e86248b8b	commit \| diff
parent	a5d7c64da9e872a63d7990ab5e4b8483d8eb8e15	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/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

Linux Kernel Source Tree.