Linus Torvalds deb9b4ce97 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm ... * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits) ARM: 7304/1: ioremap: fix boundary check when reusing static mapping ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2 ARM: 7298/1: realview: fix mapping of MPCore private memory region PCMCIA: fix sa1111 oops on remove ARM: 7288/1: mach-sa1100: add missing module_init() call ARM: 7297/1: smp_twd: make sure timer is stopped before registering it ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes MFD: ucb1x00-ts: fix resume failure MFD: ucb1x00-core: fix gpiolib direction_output handling MFD: ucb1x00-core: fix missing restore of io output data on resume MFD: mcp-core: fix mcp_priv() to be more type safe MFD: mcp-core: fix complaints from the genirq layer Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources." ... Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into mach-imx5 (commit 784a90c0a7: "ARM i.MX: Merge i.MX5 support into mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by the CPU_V7 logic from it in the old location in rmk's branch (commit a092f2b153: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs").		2012-01-28 13:27:10 -08:00
..
include/mach
clock-imx1.c
clock-imx6q.c	ARM: imx6: add missing twd_clk for imx6q clock	2012-01-20 10:16:39 +08:00
clock-imx21.c
clock-imx25.c
clock-imx27.c
clock-imx31.c
clock-imx35.c
clock-mx51-mx53.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
cpu_op-mx51.c
cpu_op-mx51.h
cpu-imx5.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
cpu-imx25.c
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
crm-regs-imx5.h
crmregs-imx31.h
devices-imx1.h
devices-imx21.h
devices-imx25.h
devices-imx27.h
devices-imx31.h
devices-imx35.h
devices-imx50.h
devices-imx51.h
devices-imx53.h
dma-v1.c
efika.h
ehci-imx5.c
ehci-imx25.c
ehci-imx27.c
ehci-imx31.c
ehci-imx35.c
eukrea_mbimx27-baseboard.c
eukrea_mbimx51-baseboard.c
eukrea_mbimxsd25-baseboard.c
eukrea_mbimxsd35-baseboard.c
eukrea_mbimxsd-baseboard.c
gpc.c
head-v7.S
hotplug.c
imx51-dt.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
imx53-dt.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
iomux-imx31.c
Kconfig	Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm	2012-01-28 13:27:10 -08:00
lluart.c
localtimer.c
mach-apf9328.c
mach-armadillo5x0.c
mach-bug.c
mach-cpuimx27.c
mach-cpuimx35.c
mach-cpuimx51.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-cpuimx51sd.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-eukrea_cpuimx25.c
mach-imx6q.c
mach-imx27_visstrim_m10.c
mach-imx27ipcam.c
mach-imx27lite.c
mach-kzm_arm11_01.c
mach-mx1ads.c
mach-mx21ads.c
mach-mx25_3ds.c
mach-mx27_3ds.c
mach-mx27ads.c
mach-mx31_3ds.c
mach-mx31ads.c
mach-mx31lilly.c
mach-mx31lite.c
mach-mx31moboard.c
mach-mx35_3ds.c
mach-mx50_rdp.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx51_babbage.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx51_efikamx.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx51_efikasb.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx53_ard.c	arm-soc fixes for 3.3-rc:	2012-01-28 13:21:54 -08:00
mach-mx53_evk.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx53_loco.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mx53_smd.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mach-mxt_td60.c
mach-pca100.c
mach-pcm037_eet.c
mach-pcm037.c
mach-pcm038.c
mach-pcm043.c
mach-qong.c
mach-scb9328.c
mach-vpr200.c
Makefile	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
Makefile.boot	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mm-imx1.c
mm-imx3.c
mm-imx5.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
mm-imx21.c
mm-imx25.c
mm-imx27.c
mmdc.c
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx31lilly-db.c
mx31lite-db.c
mx31moboard-devboard.c
mx31moboard-marxbot.c
mx31moboard-smartbot.c
mx51_efika.c
pcm037.h
pcm970-baseboard.c
platsmp.c
pm-imx5.c	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
pm-imx6q.c
pm-imx27.c
src.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00