Merge branch 'wireless-2.6' into wireless-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-dev.h
This commit is contained in:
Reinette Chatre 2010-05-10 15:08:11 -07:00
commit a15707d80e
5 changed files with 22 additions and 1 deletions