Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

This commit is contained in:
John W. Linville 2010-02-26 16:58:18 -05:00
commit be41f5c7e3
2 changed files with 8 additions and 4 deletions