Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl

This commit is contained in:
John W. Linville 2011-08-10 13:51:19 -04:00
commit 20adc1aecc
6 changed files with 74 additions and 70 deletions