tree 1ecf3b8cb48bf025596d193dc0e9bd89f3ce66ff
parent 61311e1bbc299b3a3a42b8d7f491b428ded964f0
parent 55d8460c921ed725f5bf46c826a6bddbe8a75c46
author Linus Torvalds <torvalds@linux-foundation.org> 1219361468 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219361468 -0700

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