From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 10 Sep 2007 21:37:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
X-Git-Tag: v2.6.23-rc6~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b1a8d700e7fdf1bc44000e3edc24cc43f904df50;p=linux.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: Rename STI/CLI macros
  m32r: build fix of entry.S
  m32r: Separate syscall table from entry.S
  m32r: Cosmetic updates of arch/m32r/kernel/entry.S
  m32r: Exit ei_handler directly for no IRQ case or IPI operations
  m32r: Simplify ei_handler code
  m32r: Define symbols to unify platform-dependent ICU checks
  m32r: Move dot.gdbinit files
  m32r: Rearrange platform-dependent codes
  m32r: Add defconfig file for the usrv platform.
  m32r: Update defconfig files for 2.6.23-rc1
  m32r: Move defconfig files to arch/m32r/configs/
---

b1a8d700e7fdf1bc44000e3edc24cc43f904df50