Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Mar 2012 18:45:40 +0000 (14:45 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Mar 2012 18:45:40 +0000 (14:45 -0400)
commit843dc6644be05edfcb14f7f7ce5b2ab2bc15b429
tree0e2c580ac949d2619522a64cc5a52585645491f5
parent5d6a1b069b7f72298aff2306a2d02b0188668218
parent9df2a0b7096873e91d1b6b0e842e9f6bdc7ee9fd
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
drivers/net/wireless/ath/ath6kl/wmi.c