From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Aug 2008 23:31:08 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.27-rc5~53
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a22c50c302c58ba2d1d2846e85239ba80da61a56;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5212/1: pxa: fix build error when CPU_PXA310 is not defined
  [ARM] 5208/1: fsg-setup.c fixes
  [ARM] fix impd1.c build warning
  [ARM] e400 config use MFP
  [ARM] e740 config use MFP
  [ARM] Fix eseries IRQ limit
  [ARM] clocklib: Update users of aliases to new API
  [ARM] clocklib: Allow dynamic alias creation
  [ARM] eseries: whitespace fixes and cleanup
---

a22c50c302c58ba2d1d2846e85239ba80da61a56