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