tree a5fd9796af13c084be5d6d5924c3c3430b1866b8
parent 2444e56b0c08e6f3e3877583841a1213e3263d98
parent 4a1fd556c1f1fbd6d9d6739efec042324732b697
author Linus Torvalds <torvalds@linux-foundation.org> 1209051371 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209051371 -0700

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