Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Sep 2011 00:28:46 +0000 (17:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Sep 2011 00:28:46 +0000 (17:28 -0700)
commitd0a77454c70d0449a5f87087deb8f0cb15145e90
treea6efb34357756faede3fd63f5a72e72977c68321
parentc338bfb5ecf6c36b2112479691d69db4c2b5a78a
parent6c6d8deb5d95a0675a8edd588bbc2249cbce5b34
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