Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Dec 2010 20:21:33 +0000 (15:21 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Dec 2010 20:21:33 +0000 (15:21 -0500)

Trivial merge