tree 00d5f49c02f178e7312b8fe98f62030d5c3aca51
parent b1219e24c09c60b903c422861378c3b99bfbbde1
parent 112a674f2f68b17ae253fe7312afc38c3e75be7a
author Linus Torvalds <torvalds@linux-foundation.org> 1258478394 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258478394 -0800

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: ensure mfp is in correct range in mfp_{read,write}
  [ARM] pxa/hx4700: fix hx4700 touchscreen pressure values
  ARM: 5787/1: U300 COH 901 331 fixes
  ARM: Fix warning in sa1100-flash.c
  [ARM] Kirkwood: disable propagation of mbus error to the CPU local bus
  [ARM] pxa: fix incorrect mfp_to_gpio() conversion
  [ARM] pxa/colibri: fix AC97 ifdefs and add missing include
  [ARM] pxa: fix missing underscores in mfp-pxa910.h
  [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y