Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 02:37:29 +0000 (19:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 02:37:29 +0000 (19:37 -0700)
commit61d6cc54896811086b51fa78d440311974a09b3a
treed02625ab046151ff915d30248093c6cf44c64066
parentc6d8f400cc7610f04177f81168c19b8407cb48c3
parent3692fd0aaef489b063518b5999c702bada5b6e22
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5091/1: Add missing bitfield include to regs-lcd.h
  [ARM] 5090/1: Correct pxafb palette typo error
  [ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver