From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Dec 2008 00:39:06 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: Ubuntu-5.10.0-12.13~35373
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4ec8f077e4dd51f713984669781e7b568b8c41e2;p=mirror_ubuntu-hirsute-kernel.git

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.
---

4ec8f077e4dd51f713984669781e7b568b8c41e2