]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 15:32:05 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 15:32:05 +0000 (08:32 -0700)
commita6e995ad7409403c5bbd6fe8f666a280e086bb22
tree3fdf4ece186941719de154d4ab973a95d451fe5d
parent547ad5ac665234953e32678f6a32385b58edefc3
parent7e483865612568268773317219d07b38a8c4d62d
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.
MAINTAINERS