tree a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73
parent 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140
parent cb00ec382b57d35b955c085198cd54a0c1fcdc94
author John W. Linville <linville@tuxdriver.com> 1325776365 -0500
committer John W. Linville <linville@tuxdriver.com> 1325776404 -0500

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

Conflicts:
	drivers/net/wireless/b43legacy/dma.c