From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2008 15:30:47 +0000 (-0700)
Subject: Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
X-Git-Tag: v2.6.27-rc8~5
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=df45eddc60e1ab4c81b61e240271eabb4fb176e8;p=linux-2.6-omap-h63xx.git

Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r/kernel/: cleanups
  m32r: export __ndelay
  m32r: export empty_zero_page
  m32r: don't offer CONFIG_ISA
  m32r: remove the unused NOHIGHMEM option
---

df45eddc60e1ab4c81b61e240271eabb4fb176e8