]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abf07b1 f6f2a5d)
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)
* '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


Trivial merge
Linux 2.6 source tree