tree b1774dad1d72b70d88ab6c51ff4b87697dfca57a
parent 9459d59fbf0bc82ff4c804679fa8bc22788eca63
parent 562db532760827f6ce30801a08e6b568848bc9f2
author Reinette Chatre <reinette.chatre@intel.com> 1273529291 -0700
committer Reinette Chatre <reinette.chatre@intel.com> 1273529291 -0700

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-dev.h