Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Jul 2011 15:05:20 +0000 (11:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Jul 2011 15:05:20 +0000 (11:05 -0400)
commite441a5eab928ddee8a946b4d48489341b41f88f2
tree86156e4e6f3cc1b8668f426f635a93d108eadf5c
parent5f0dd296a01c8173fcc05a8b262a1168ae90bc74
parentf1a46384ad568f72c11edbe2a3ec284bf32f2dbd
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx
drivers/net/wireless/wl12xx/cmd.c