Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jun 2012 18:02:56 +0000 (14:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jun 2012 18:02:56 +0000 (14:02 -0400)
commit4e924fec591ef75076eab95954d90411862d3a87
tree968a9d456e76e7bf72e2bd9409ae3d64faaee115
parentdd03cff23d694cfb0fdae80cb618e7ced05ea696
parent2d4524ac18a3965051f6279aff5e9b1d72ac9d7f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem