From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 16 May 2006 22:15:59 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.17-rc5~110
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=509b70b677ca35a0e800807c6470181df5008d70;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3523/1: Serial core pm_state
---

509b70b677ca35a0e800807c6470181df5008d70