From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Oct 2013 17:02:23 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.12-rc6~21
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52;p=linux-2.6-block.git

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

Pull ARM fixes from Russell King:
 "Some more ARM fixes, nothing particularly major here.  The biggest
  change is to fix the SMP_ON_UP code so that it works with TI's Aegis
  cores"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7851/1: check for number of arguments in syscall_get/set_arguments()
  ARM: 7846/1: Update SMP_ON_UP code to detect A9MPCore with 1 CPU devices
  ARM: 7845/1: sharpsl_param.c: fix invalid memory access for pxa devices
  ARM: 7843/1: drop asm/types.h from generic-y
  ARM: 7842/1: MCPM: don't explode if invoked without being initialized first
---

d6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52