Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
commit789319db76ccb8f61d2f6a91d2f2fcb70edae9c5
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2008 00:21:32 +0000 (20 17:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2008 00:21:32 +0000 (20 17:21 -0700)
tree9f00eee8fbeec58c0a5ee6c9ebb8906e8a832670
parentfd9908c078b30db393e9855fb96f804793af23ba
parent93dae5b70e7c1c8e927d22e1c20a941ca376906a
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Add global register dumping facility.
  sparc: remove CVS keywords
  sparc64: remove CVS keywords