]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 15:36:11 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 15:36:11 +0000 (08:36 -0700)
* '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


Trivial merge