Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 19:33:16 +0000 (12:33 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 19:33:16 +0000 (12:33 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix:
  sparc64: fix alignment bug in linker definition script


Trivial merge