Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2011 00:32:20 +0000 (16:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2011 00:32:20 +0000 (16:32 -0800)
commitfb7b5a956992fdc53d0b9c8ea29b51b92839dc1b
treec54022cad761358de7488d7a46bab2fa2139343f
parent5a62f995446be44811fefa48f91f9efb7ea172d7
parent5edddaab1d5d6143c23fef119a24ea768915681a
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 bootup regression due to perf init ordering.