Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Mar 2008 15:04:28 +0000 (08:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Mar 2008 15:04:28 +0000 (08:04 -0700)
commitae51801ba5ca27c2c571eb508daa99b392e79bd4
tree07f9c2a4cad33791c87211fb43553bf42f6fa4b5
parent7d3628b230ecbdc29566c18bc7800ff8ed66a71f
parent4cfea5a7dfcc2766251e50ca30271a782d5004ad
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix atomic backoff limit.