From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 26 Jun 2007 23:51:23 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.22-rc7~46
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f436ab43614f105a4685c976a85a171bc112c802;p=~emulex%2Finfiniband.git

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

f436ab43614f105a4685c976a85a171bc112c802