Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:43:58 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:43:58 +0000 (12:43 -0700)
commitd4bd4b40f8b18ad6a7e269e8f5c06f953f51016d
tree7d8007097c318246179ed396ea0c075b42e46637
parent1765a367a3b5d5e9692949b0c5ec933eff2c0701
parent1ef48593bd6a508984d1270a1075532628bfd9c8
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: sun4m SMP: fix wrong shift instruction in IPI handler
  sparc32,leon: Added __init declaration to leon_flush_needed()
  sparc/irqs: Do not trace arch_local_{*,irq_*} functions