[GIT PULL] mxs fixes for 3.9, take 2

[Arnd Bergmann]

On Monday 11 March 2013, Shawn Guo wrote:
> The following changes since commit 95381f38c0ed85be732553bf56f613ce701d411b:
> 
>   ARM: mxs: ocotp: Fix sparse warning (2013-03-04 10:07:28 +0800)
> 
> are available in the git repository at:
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-fixes-3.9-2
> 
> for you to fetch changes up to 4a38a8502b0ea4ecbe86f60e0b2416771c51888d:
> 
>   ARM: mxs: cfa10049: Fix fb initialisation function (2013-03-07 10:54:23 +0800)
> 
> ----------------------------------------------------------------
> The 2nd mxs fixes for 3.9:
>  - Fix an error caused by incorrect conflict resolution when
>    applying the patch
> 

Applied to fixes branch, thanks!

	Arnd