tree dc24485bdff37ca6a83c69e93ffdbe5c5807b59d
parent 2fe66ec242d3f76e3b0101f36419e7e5405bcff3
parent 4f8559383c41262b50dc758e2e310f257ce6a14d
author John W. Linville <linville@tuxdriver.com> 1290635360 -0500
committer John W. Linville <linville@tuxdriver.com> 1290635360 -0500

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