diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-15 17:35:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-15 17:35:19 -0700 |
commit | 9a8e5d41124a7352e554581333d4d9689dc1526b (patch) | |
tree | 88e74fe2cdca5ca2d1d5424a728ade00a12f05d3 /arch/arc/plat-eznps/Kconfig | |
parent | 12e993b89464707398e4209bd99983e376454985 (diff) | |
parent | 708e5978dfee0090a27c5531ce3b017dd6d190a2 (diff) |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Nothing too disasterous, the biggest thing being the removal of the
regulator support for vcore in the AMBA driver; only one SoC was using
this and it got broken during the last merge window, which then
started causing problems for other people. Mutual agreement was
reached for it to be removed."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7386/1: jump_label: fixup for rename to static_key
ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
ARM: 7383/1: nommu: populate vectors page from paging_init
ARM: 7381/1: nommu: fix typo in mm/Kconfig
ARM: 7380/1: DT: do not add a zero-sized memory property
ARM: 7379/1: DT: fix atags_to_fdt() second call site
ARM: 7366/3: amba: Remove AMBA level regulator support
ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
Diffstat (limited to 'arch/arc/plat-eznps/Kconfig')
0 files changed, 0 insertions, 0 deletions