Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000 (14:47 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000 (14:47 -0700)

Trivial merge