Merge tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 18:33:01 +0000 (10:33 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 18:33:01 +0000 (10:33 -0800)
commit9916c159821b3f712f585348154918d65bc2f5b7
tree49bd1eee33db08492ba9b4876af8cde6c8853dea
parent34178c585422be69fdcbcacdbf048d96c2f8c671
parent8dd5c66bc6b12d86b1656851c20946efd587875e
Merge tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo:
imx fixes for 3.8, take 4

 - It fixes fec ptp clock pointer in device tree source.

* tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6: fix fec ptp clock slow 10 time