Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Apr 2011 18:36:35 +0000 (14:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Apr 2011 18:36:35 +0000 (14:36 -0400)
commite55034e978970f5a058dfa9c9cc923ff75fc6a12
treedcb40fbd52bd0db1f641d7e64aa472a7aee64328
parent73b48099cc265f88fa1255f3f43e52fe6a94fd5c
parentcf27d8677515441602f5e4e40f90448e964504b8
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx