diff options
| author | Kevin Hilman | 2013-08-23 12:06:16 -0700 |
|---|---|---|
| committer | Kevin Hilman | 2013-08-23 12:06:16 -0700 |
| commit | d519049cb17b63604149431496460ff9cf00845d (patch) | |
| tree | eeb85b3a4d0d9508e0f9ad360e43c0367001c9d5 /arch/arm/kernel/perf_event.c | |
| parent | 334b0f0913a1a980d3167c3bc4415a788225125f (diff) | |
| parent | 7543360721cfdce687c4b53a03f08f5ba21d4745 (diff) | |
Merge tag 'mxs-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo:
It contains mxs soc changes for 3.12.
- Run savedefconfig on mxs_defconfig to clean it up
- Fix on mxs_restart() routine for interrupt context calling
- A few other random updates and cleanups
* tag 'mxs-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: pm: Include "pm.h"
ARM: mxs: Simplify detection of CrystalFontz boards
ARM: mach-mxs: Remove "TO" string from revision field
ARM: mxs: Fix BUG() when invoking mxs_restart() from interrupt context
ARM: mxs: Allow DT clock providers
ARM: mxs_defconfig: Cleanup mxs_defconfig
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions