tree d02625ab046151ff915d30248093c6cf44c64066
parent c6d8f400cc7610f04177f81168c19b8407cb48c3
parent 3692fd0aaef489b063518b5999c702bada5b6e22
author Linus Torvalds <torvalds@linux-foundation.org> 1213324649 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213324649 -0700

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