Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Aug 2011 18:27:52 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Aug 2011 18:27:52 +0000 (14:27 -0400)
commite0a8c583c39580a97919c026598eedbf014cd8a5
treef8bbc56223b5acacad4cdde6c776da2d5e7b6a59
parenta508a6ea234571e0e7d1e9f2455fc1eca54d1fef
parent04b4d69c89593d907d81a4aa33e4e42a632fe436
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx