tree 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0
parent 03f52a0a554210d5049eeed9f1bb29047dc807cb
parent 0751f8654602e4255f0b9c17784d8100d5896010
author John W. Linville <linville@tuxdriver.com> 1354118163 -0500
committer John W. Linville <linville@tuxdriver.com> 1354118163 -0500

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/tx.c