Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 22 Aug 2007 18:13:22 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 22 Aug 2007 18:13:22 +0000 (11:13 -0700)
commit7da6cd8bdfe13fecc061b868dda57ee1a3a051f4
treec91173fc74f9e66a496296b031728a82835d70b3
parent13c926e04602db207366c7d213dd99d443ac4ad8
parentefb896300cc9215f60bb4f7f77f93541ab9f1713
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
  [SPARC64]: Need to clobber global reg vars in switch_to().