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)
commit901720afa30f182c17b088ce4f692249332111bd
tree964230c44dd07271ab28ac7337d5b3d0bbf257c6
parent668ebab44c7dd41e6823e6be15d8b28b87ddc0cd
parentde195fd0016f9ab85f1d596dca48dade33f26d36
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Partially revert "Constify function pointer tables."