| commit | 877cd953167bc50765719ca047a3ac2c4fdd7aaf | |
| author | Olof Johansson <olof@lixom.net> | |
| Sun, 10 Feb 2013 02:27:28 +0000 (9 18:27 -0800) | ||
| committer | Olof Johansson <olof@lixom.net> | |
| Sun, 10 Feb 2013 02:27:28 +0000 (9 18:27 -0800) | ||
| tree | 80b284bbdcf7014932d4c5f8ed4ad2427f030af4 | treesnapshot (tar.gz zip) |
| parent | f58cf70ed954c179825cd0c51f5f64cd1ed74ed3 | commitdiff |
| parent | e1ab0056df613662929290f385590da2cccb8c19 | commitdiff |
Merge tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo:
mxs soc changes for 3.9
- A couple of optimization on timer
- Some updates on mxs_defconfig
* tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
ARM: mxs: use apbx bus clock to drive the timers on timrotv2
ARM: mxs: Update mxs_defconfig
From Shawn Guo:
mxs soc changes for 3.9
- A couple of optimization on timer
- Some updates on mxs_defconfig
* tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
ARM: mxs: use apbx bus clock to drive the timers on timrotv2
ARM: mxs: Update mxs_defconfig