Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 24 Jan 2008 16:12:38 +0000 (08:12 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 24 Jan 2008 16:12:38 +0000 (08:12 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Partially revert "Constify function pointer tables."


Trivial merge