Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 May 2011 17:56:27 +0000 (13:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 May 2011 17:56:27 +0000 (13:56 -0400)
commit890641b2512f491f28e4ef7536dca1ea93dae997
tree4dec378be564731945e033aca438e41324a3a522
parenteaef6a93bd52a2cc47b9fce201310010707afdb4
parent25eaea30cd7b009ba2ca693708330d2f395cbc4d
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx