From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Oct 2009 04:57:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a0382f6fceaf0c6479e582e1054f36333ea3d24;p=linux-beck.git

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

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: Fix IPI function calls for SMP
  m32r: Fix set_memory() for DISCONTIGMEM
  m32r: add rtc_lock variable
  m32r: define ioread* and iowrite* macros
  m32r: export delay loop symbols
  m32r: fix tme_handler
---

8a0382f6fceaf0c6479e582e1054f36333ea3d24