Merge branch 'for_3.12/imx' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti...
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 05:57:14 +0000 (13:57 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 05:57:14 +0000 (13:57 +0800)

Trivial merge