tree 3d3dd17a4e3ff0a6fd0c571d449085d411f7dc17
parent 8e44e4347735229b518cc02938c351428bcd7492
parent 85233c43f7fece10a3ea8ed34f0d546b8dd3a435
author Linus Torvalds <torvalds@linux-foundation.org> 1253838309 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253838309 -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: Cleanup linker script using new linker script macros.
  m32r: Move the spi_stack_top and spu_stack_top into .init.data section.
  m32r: Remove unused .altinstructions and .exit.* code from linker script.
  m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h.
  m32r: Define THREAD_SIZE only once.
  m32r: make PAGE_SIZE available to assembly.