tree b5e5787a6d5c15e589d275c7434ebbf341257234
parent db62983a1e4b2af9e79c97af768f0c8b80bd93f0
parent 320d6c1b56de5f461c6062625b9664095f90ee95
author John W. Linville <linville@tuxdriver.com> 1298405422 -0500
committer John W. Linville <linville@tuxdriver.com> 1298405422 -0500

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