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)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix bootup regression due to perf init ordering.


Trivial merge