From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 16 Nov 2006 20:22:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.19~85
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Remove OP_MAX_COUNTER
  [ARM] Remove PM_LEGACY=y from selected ARM defconfigs
  [ARM] 3857/2: pnx4008: add devices' registration
---

237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8