Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:23:00 +0000 (16:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:23:00 +0000 (16:23 -0500)
commit427749861d74bc1a6f9e5dc523cf0ea2e42e8eed
tree0fb30928ad6ee5bba95d94818bc1fa3ea6f7730b
parent9077f2189e54215a690048ab14ad6f7d8b5a5af7
parentb622d992c21a85ce590afe2c18977ed28b457e0e
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx