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
board-mop500-pins.c
board-mop500-regulators.c
board-mop500-regulators.h
board-mop500-sdi.c	mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball	2012-01-20 13:32:10 +01:00
board-mop500-stuib.c
board-mop500-u8500uib.c
board-mop500-uib.c
board-mop500.c
board-mop500.h
board-u5500-sdi.c
board-u5500.c
cache-l2x0.c	mach-ux500: do not override outer.inv_all	2012-01-20 13:12:48 +01:00
clock.c
clock.h
cpu-db5500.c
cpu-db8500.c
cpu.c
devices-common.c
devices-common.h
devices-db5500.h
devices-db8500.c
devices-db8500.h
devices.c
dma-db5500.c
headsmp.S
hotplug.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
id.c
Kconfig	mach-ux500: enable ARM errata 764369	2012-01-20 13:15:19 +01:00
localtimer.c
Makefile
Makefile.boot
mbox-db5500.c
modem-irq-db5500.c
pins-db5500.h
pins-db8500.h
platsmp.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
ste-dma40-db5500.h
ste-dma40-db8500.h
timer.c
usb.c	mach-ux500: musb: now musb is always in OTG mode	2012-01-20 13:12:38 +01:00