Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 22:15:59 +0000 (15:15 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 22:15:59 +0000 (15:15 -0700)
commit509b70b677ca35a0e800807c6470181df5008d70
treea877b27154b0ce0aab10a1d76106a32f4701f456
parent716f8954fb3029ca2df52a986b60af8d06f093ee
parent1281e36027a9119356bd93b5e7853c72c35dd462
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