From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 20 Jan 2008 10:18:12 +0000 (+0000)
Subject: Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind... 
X-Git-Tag: v2.6.24~34
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1fc3858a6358400195c067f8726cf3c86a180d80;p=~emulex%2Finfiniband.git

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

1fc3858a6358400195c067f8726cf3c86a180d80