tree 4c1b3e0ea4bfbd8f9dd72ee95773f4be2dd087d2
parent f3dc1294c8a40d7eedd676b65f42f0b828fd3d8c
parent e6ee4b2b57a8e0d8e551031173de080b338d3969
author Linus Torvalds <torvalds@linux-foundation.org> 1356054983 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1356054983 -0800

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
 "A number of smallish fixes scattered around the ARM code.  Probably
  the most serious one is the one from Al addressing the missing locking
  in the swap emulation code."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards
  ARM: 7606/1: cache: flush to LoUU instead of LoUIS on uniprocessor CPUs
  ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
  ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata
  ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure
  ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S