From: Arnd Bergmann Date: Thu, 23 Aug 2012 15:02:42 +0000 (+0200) Subject: Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2... X-Git-Tag: firefly_0821_release~3680^2~2149^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e72fe1fca4490474984d6356bbf66e2daa89f73;p=firefly-linux-kernel-4.4.55.git Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes * 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx51-babbage: fix esdhc cd/wp properties ARM: imx6: spin the cpu until hardware takes it down ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path Also updates to Linux 3.6-rc2 Signed-off-by: Arnd Bergmann --- 1e72fe1fca4490474984d6356bbf66e2daa89f73