tree 3dd9b3569799f7962b523a068052445e2d2c51aa
parent 1b7fe59322bef9e7a2c05b64a07a66b875299736
parent 8d5eab5aa676378b4c9daa62d10d08a0bca04677
author John W. Linville <linville@tuxdriver.com> 1299870671 -0500
committer John W. Linville <linville@tuxdriver.com> 1299870671 -0500

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