From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jan 2009 18:33:01 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v2.6.29-rc3~30
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132;p=linux-2.6-omap-h63xx.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
---

ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132