Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 20:02:18 +0000 (15:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Dec 2011 20:02:18 +0000 (15:02 -0500)
commit03877332aef0659f43d169a71cbd5256b0b0d1be
treed2ae1b58ade55c005bcf5669fbf7b6b99a1322c8
parent885765f148b69b0269a50d0d89d2f20fe018fb8d
parentee91d1855137ba9c16d1e7815d562056c3f55e7f
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx