Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 20:33:16 +0000 (15:33 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 20:33:16 +0000 (15:33 -0500)
commitcbdbc5eb542da242bfa3cfe18e7828d21c670969
tree6d36564e0eff35fe1ed956ef7b35ff383923417a
parent8d8d3fdc0d42be0ba75be227465773a54bb48a0b
parente5e2f24b3eec67a7a35d43654a997f98ca21aff2
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx