tree dab480183ac0e64bfe9250e1f294705d1a424c78
parent ffbc03bc75b39c7bd412e7cc6d2185c11b0ffedd
parent 931749bf78b969c54de9bbc67cf29b13a40bb73b
author John W. Linville <linville@tuxdriver.com> 1307555061 -0400
committer John W. Linville <linville@tuxdriver.com> 1307555061 -0400

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