Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 10:06:56 +0000 (21:06 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 10:06:56 +0000 (21:06 +1100)
commit42bb1899221d362bee5480e3abc9b05243bf38fb
tree2887b9c6e3b1a25836447a825ae466a9b69f43a5
parentcec03afcb62fbbb0eaf943f6349ade61b89d7d40
parent4787083fcce866e275bedeb87cd6dfba34c84253
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix inconsistent .section usage in lib/
  [SPARC/SPARC64]: Fix usage of .section .sched.text in assembler code.