Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Jun 2007 23:51:23 +0000 (16:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Jun 2007 23:51:23 +0000 (16:51 -0700)
commitf436ab43614f105a4685c976a85a171bc112c802
tree21db536f54a642c627008c664e2679c0ff3ccbc3
parent6cd236e0057704d1f5c77908374079e021c83928
parent0c07f6115b779ae4597749d47dec228c6d2d1c7c
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4449/1: more entries in arch/arm/boot/.gitignore
  [ARM] 4452/1: Force the literal pool dump before reloc_end
  [ARM] Update show_regs/oops register format
  [ARM] Add support for pause_on_oops and display preempt/smp options