tree 39eb7e8e06737b295007126f4e16c1b688427163
parent 1049f6413f6e52572a768ca1590fa479ef0a48e8
parent 9a4ba833a2d0016cf836827e136f0c219834bd41
author John W. Linville <linville@tuxdriver.com> 1309455246 -0400
committer John W. Linville <linville@tuxdriver.com> 1309455246 -0400

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