Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jul 2011 19:03:16 +0000 (15:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jul 2011 19:03:16 +0000 (15:03 -0400)
commit333c0dbfcd7847d02d75a2d2a80d2f5e1cdc51dc
treefa00cbe82993c2aa8cb9f52d172a89eaaefb0e0f
parent115f9450babbf2ed530db04e16a99df28cec85dd
parent95dac04f881322b510c45e5ae83f0dbee4f823a2
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx
drivers/net/wireless/wl12xx/cmd.c