Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 May 2008 17:14:37 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 May 2008 17:14:37 +0000 (10:14 -0700)
commit0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa
tree26897c01b2448a51ed086ab55a44fc4e0a6f405a
parentc5e6fd28e5776200a737e9df337a529d36fa9a54
parent551dec47bb5964478db594385a896eb0d4ab2b0a
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: global_reg_snapshot is not for userspace