From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2015 15:10:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.1~232
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb65d872d7a8dc629837a49513911d0281577bfd;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A few fixes for the recently merged development updates:

   - the update to convert a code branch in the procinfo structure
     forgot to update the nommu code.

   - VDSO only supported for V7 CPUs and later.

   - VDSO build creates files which should be ignored by git but are not.

   - ensure that make arch/arm/vdso/ doesn't build if it isn't enabled"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
  ARM: 8343/1: VDSO: add build artifacts to .gitignore
  ARM: Fix nommu booting
  ARM: 8342/1: VDSO: depend on CPU_V7
---

fb65d872d7a8dc629837a49513911d0281577bfd