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)
* master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3523/1: Serial core pm_state


Trivial merge