Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 14 Aug 2012 18:42:54 +0000 (14:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 14 Aug 2012 18:42:54 +0000 (14:42 -0400)
commit1e55217e174f4e6920fd441dcd3aaf8e37645460
tree896dcc55f7f3d54022677747cdcfc26897d33549
parent3bf671af14d591ede9251acb0085e8017f3705e7
parent7dd6753f6d2e7e0ccbf2263cef3a9fff6bc89988
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem