tree 60d101b813135274f1c2366bae1693d6d72e3681
parent 53f7b9bccd332bba39be78f9085ac1a26fa387fc
parent 7071b2914a540b43dfcad17f6892a8c115799d50
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189460240 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189460240 -0700

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/