Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 04:57:06 +0000 (21:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 04:57:06 +0000 (21:57 -0700)
commit8a0382f6fceaf0c6479e582e1054f36333ea3d24
tree2ec107d486a57584f2b4ae431e70abbc11661d68
parent0b5759c654e74c8dc317ea2c6b3a7476160f688a
parent0a3d31b79e7fa600108e699805e2b2f9ea1f3194
Merge branch 'for-linus' of git://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