Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 5 Oct 2007 21:09:10 +0000 (14:09 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 5 Oct 2007 21:09:10 +0000 (14:09 -0700)
commit9f34073b4e54ad58541e0e2b4a87f4f6c1460e21
treea5422b696e60b3ec3b4138d16e305781408fed97
parentc946b3047205d7e107be16885bbb42ab9f10350a
parent4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a
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