tree 3fdf4ece186941719de154d4ab973a95d451fe5d
parent 547ad5ac665234953e32678f6a32385b58edefc3
parent 7e483865612568268773317219d07b38a8c4d62d
author Linus Torvalds <torvalds@linux-foundation.org> 1253719925 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253719925 -0700

Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score

* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
  score: update email address in MAINTAINERS.
  score: Cleanup linker script using new macros.
  score: Make THREAD_SIZE available to assembly files.
  score: Make PAGE_SIZE available to assembly.