tree fdc3e603162e3ad63f6ae4160f68eb803bb78d58
parent 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5
parent 1728943d83e9fd919e454332fe344944123b3c3a
author John W. Linville <linville@tuxdriver.com> 1285945956 -0400
committer John W. Linville <linville@tuxdriver.com> 1285945956 -0400

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