From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Sep 2009 00:25:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~24399
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=851b147e4411df6a1e7e90e2a609773c277eefd2;p=mirror_ubuntu-artful-kernel.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: 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.
---

851b147e4411df6a1e7e90e2a609773c277eefd2