From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2008 02:37:29 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.26-rc7~42
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61d6cc54896811086b51fa78d440311974a09b3a;p=linux-2.6

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
---

61d6cc54896811086b51fa78d440311974a09b3a