Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:23:41 +0000 (14:23 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:23:41 +0000 (14:23 -0400)

Trivial merge