Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 13 May 2011 19:18:35 +0000 (15:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 13 May 2011 19:18:35 +0000 (15:18 -0400)
commitb376704bf57e1b731fe2dd6e9aa83a1d42a45ef9
tree298b05b5875d63e4228a0416d94844f575028edf
parent1159024d4c0aafecaa0c6635c55153b4b39cc1c8
parent9439064cd9fce8a4db716a748dbf581eb234f9c7
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx