tree 09083ae0f3a36872e15477a02d74ce087a4902d3
parent abf07b19de3ae2fcf63142f1f9a3e4ee537f9f55
parent f6f2a5db6ddf164923c1f8af27d36c2d7ab994e0
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1200824292 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1200824292 +0000

Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  ARM: OMAP1: Fix compile for board-nokia770
  ARM: OMAP1: Keymap fix for f-sample and p2-sample