Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 17:49:21 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 17:49:21 +0000 (13:49 -0400)
commitf1b98bb367f672ee78800fa62880b522bef86eed
tree5cb12a850dbc749fc593ecb4eacbb5abd02e89c2
parent97ea6d0f3eb019891038cd2dfddb749d6bf219be
parentaf390f4dd35373b3ca32bafc12d7f2ad12840529
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx