Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Nov 2011 18:46:34 +0000 (14:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Nov 2011 18:46:34 +0000 (14:46 -0400)
commit22097fd297c85ec6c2e700d506f231f7cae442e1
tree4a16a6821c5dc82a512b56ade6fcf64e0935d0aa
parent1a67a573b8d9f02211f36fbab50f6265dc49384a
parent54d5026e7c173edae8a27c293c286f1783d21ae8
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem