tree 4c951595e2824b19ca9d9c7190a6046481322c14
parent a6e470fd1bbfea8e51d2b10b0713e802b782f19a
parent af38d90d6a5e135b546a3f86222ba2ad895ba4ae
author Linus Torvalds <torvalds@linux-foundation.org> 1228091946 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228091946 -0800

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  Allow architectures to override copy_user_highpage()
  [ARM] pxa/palmtx: misc fixes to use generic GPIO API
  ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling
  [ARM] pxa/corgi: update default config to exclude tosa from being built
  [ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
  ARM: OMAP: Typo fix for clock_allow_idle
  ARM: OMAP: Remove broken LCD driver for SX1
  [ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0
  [ARM] pxa/MioA701: bluetooth resume fix
  [ARM] pxa/MioA701: fix memory corruption.