Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 20 Jan 2008 10:18:12 +0000 (10:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 20 Jan 2008 10:18:12 +0000 (10:18 +0000)
commit1fc3858a6358400195c067f8726cf3c86a180d80
tree09083ae0f3a36872e15477a02d74ce087a4902d3
parentabf07b19de3ae2fcf63142f1f9a3e4ee537f9f55
parentf6f2a5db6ddf164923c1f8af27d36c2d7ab994e0
Merge branch 'omap-fixes' of git://git./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