diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-12 17:27:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-12 17:27:41 -0700 |
| commit | 5889fc32171a41d2f306bba320715b72655dcb1a (patch) | |
| tree | 7bec4883544f504664a01a600688d8fd963c2a7d /arch/m68k/include/asm/ftrace.h | |
| parent | 1bc4a5be0acbd16de4df6e4fb73a76fa92e9a521 (diff) | |
| parent | 85d5c4a362add39f7491b38ed0160df1dcae1d2b (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM: SoC fixes from Olof Johansson:
"I was hoping to be done with fixes for 3.4 but we got two branches
from subarch maintainers the last couple of days. So here is one
last(?) pull request for arm-soc containing 7 patches:
- Five of them are for shmobile dealing with SMP setup and compile
failures
- The remaining two are for regressions on the Samsung platforms"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
ARM: EXYNOS: use s5p-timer for UniversalC210 board
ARM / mach-shmobile: Invalidate caches when booting secondary cores
ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
Diffstat (limited to 'arch/m68k/include/asm/ftrace.h')
0 files changed, 0 insertions, 0 deletions