62bac2bde5c68
parent 4ec62b2b2e6bd7ddef7b6cea6e5db7b5578a6532
parent d944d549aa86e08cba080396513234cf048fee1f
author Linus Torvalds <torvalds@linux-foundation.org> 1266713705 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266713705 -0800

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
*º