From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Sep 2011 00:28:46 +0000 (-0700)
Subject: Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur... 
X-Git-Tag: firefly_0821_release~3680^2~4506
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0a77454c70d0449a5f87087deb8f0cb15145e90;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
  ARM: 7080/1: l2x0: make sure I&D are not locked down on init
  ARM: 7081/1: mach-integrator: fix the clocksource
  NET: am79c961: fix race in link status code
  ARM: 7067/1: mm: keep significant bits in pfn_valid
---

d0a77454c70d0449a5f87087deb8f0cb15145e90