tree 1c61b53899e26839941e46d9f6e4bba28ddd23b5
parent 11b57f90257c1d6a91cee720151b69e0c2020cf6
parent 1e2f9295f4c657500111514f92a3d3894d0e05b4
author John W. Linville <linville@tuxdriver.com> 1389369580 -0500
committer John W. Linville <linville@tuxdriver.com> 1389369580 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/ieee802154/6lowpan.c