tree 5e07f18c04f497833c6b5f043360f5ef58f1f028
parent a5e944f1d955f3819503348426763e21e0413ba6
parent f2fa1b015e9c199e45c836c769d94db595150731
author Reinette Chatre <reinette.chatre@intel.com> 1271450620 -0700
committer Reinette Chatre <reinette.chatre@intel.com> 1271450620 -0700

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

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