tree cb4702d50bbe1d10ab9320ad3f63323b817727f7
parent 29546a6404e3a4b5d13f0a9586eb5cf1c3b25167
parent e46395a4b3d32d161d8b6d8e4a002972b1faae3e
author John W. Linville <linville@tuxdriver.com> 1299265840 -0500
committer John W. Linville <linville@tuxdriver.com> 1299265840 -0500

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