Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 18:18:22 +0000 (13:18 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 18:18:22 +0000 (13:18 -0500)
commitf8a36ca7860ea331a39042532644464caa9670cf
tree0363dabf1e46f17c755aecbd09fc9f0cd30fd6cb
parent6a1b580b6d811434e4d441bfee1378513e05ef9b
parent7d5c44d931e46be249dae5426da1fe4384ea95a5
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem