Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:44:17 +0000 (15:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:44:17 +0000 (15:44 -0500)
commit09db47b08a9b54f59ee1cfed80837fa2cae87bd1
treeba0fe25d92a2b8250828b57bdcb79f62901426db
parenta0019bca04029d25a8bbbaaaf28487e6ccd7878e
parent72c2d9e511846a4f2759389b38ed8a5553579eb3
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx