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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c