From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 5 Oct 2007 21:09:10 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.23~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f34073b4e54ad58541e0e2b4a87f4f6c1460e21;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend
  [ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend
---

9f34073b4e54ad58541e0e2b4a87f4f6c1460e21