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)
commitb4949b84567f3ae1227d076fc95bbd8efea06506
tree0363dabf1e46f17c755aecbd09fc9f0cd30fd6cb
parentcd7816d14953c8af910af5bb92f488b0b277e29d
parent96f1f05af76b601ab21a7dc603ae0a1cea4efc3d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem