tree c2336ab480ac0fd62e0dc41b391d99c97158dc9c
parent b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6
parent 92c6f8d849178582fc527aaf1e51dd37a74767d3
author John W. Linville <linville@tuxdriver.com> 1262030951 -0500
committer John W. Linville <linville@tuxdriver.com> 1262030951 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6