mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-31 16:38:12 +00:00
Code Issues Releases Wiki Activity
linux-stable/arch/arm/mach-ux500
History
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 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
board-mop500-pins.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
board-mop500-regulators.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-mop500-regulators.h mach-ux500: configure board for the TPS61052 regulator v2 2011-03-28 08:54:23 +02:00
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 mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-mop500-uib.c mach-x500: fix SECTION warnings in uib 2011-06-22 13:26:49 +02:00
board-mop500.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
board-mop500.h ARM: ux500: update the MOP500 GPIO assignments 2011-12-12 09:48:31 +01:00
board-u5500-sdi.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
board-u5500.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 2012-01-13 20:43:32 -08:00
cache-l2x0.c mach-ux500: do not override outer.inv_all 2012-01-20 13:12:48 +01:00
clock.c ARM: ux500: fix the smp_twd clock calculation 2011-12-19 00:35:08 +01:00
clock.h ux500: add debugfs support for powerdebug 2010-12-20 13:32:45 +01:00
cpu-db5500.c New feature development 2012-01-09 14:38:51 -08:00
cpu-db8500.c New feature development 2012-01-09 14:38:51 -08:00
cpu.c Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
devices-common.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
devices-common.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices-db5500.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices-db8500.c ARM: ux500: remove support for early silicon revisions 2011-12-19 00:35:07 +01:00
devices-db8500.h ARM: 6830/1: mach-ux500: force PrimeCell revisions 2011-05-26 10:33:35 +01:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
dma-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
headsmp.S ARM: ux500: add missing ENDPROC to headsmp.S 2012-01-16 08:36:03 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
id.c ARM: ux500: support DB8520 2011-12-19 00:35:05 +01:00
Kconfig mach-ux500: enable ARM errata 764369 2012-01-20 13:15:19 +01:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
Makefile Merge branch 'stericsson/cleanup' into next/timer 2011-10-31 23:42:23 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mbox-db5500.c treewide: Fix iomap resource size miscalculations 2011-04-10 17:01:04 +02:00
modem-irq-db5500.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
pins-db5500.h
pins-db8500.h mach-ux500: remove pull-pinconfig and add SPI2 2011-08-30 09:23:11 +02:00
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 ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
timer.c clocksource: fixup ux500 build problems 2011-10-03 09:34:16 +02:00
usb.c mach-ux500: musb: now musb is always in OTG mode 2012-01-20 13:12:38 +01:00