Merge remote-tracking branch 'wireless-next/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)

Trivial merge