Merge branch 'wireless-next-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-10-12 15:52:25 -04:00
commit 5807bae7ed
2 changed files with 6 additions and 5 deletions