From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2010 00:55:05 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.0~5989
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf7ad04300f4ab0078e6bc41e305423ea159e8c4;p=platform%2Fkernel%2Flinux-amlogic.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: allow alignment fault mode to be configured at kernel boot
  ARM: Update mach-types
  ARM: 5951/1: ARM: fix documentation of the PrimeCell bus
  ARM: 5950/1: ARM: Fix build error for arm1026ej-s processor
  MAINTAINERS: fix my e-mail and status for Gemini and FA526
  Gemini: wrong registers used to set reg_level in gpio_set_irq_type()
  ARM: 5944/1: scsi: fix timer setup in fas216.c
  ARM: 5938/1: ARM: L2: export outer_cache_fns
---

cf7ad04300f4ab0078e6bc41e305423ea159e8c4