From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Apr 2008 15:36:11 +0000 (-0700)
Subject: Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.26-rc1~1090
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06;p=linux-2.6

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
  [ARM] 5010/1: htc-pasic3: remove unused defines and includes
  [ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
  [ARM] fix lh7a40x/kev7a400 build
---

8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06