Merge remote-tracking branch 'regulator/topic/change' into regulator-next
Mark Brown [Mon, 10 Dec 2012 03:42:52 +0000 (12:42 +0900)]

Trivial merge