tree 069dc6332c2987dd7a357c069b6316404147d01e
parent e7d688ec86c9c6aa94b58eeb266f833a76407018
parent 03717e3d12b625268848414e39beda25e4515692
author Linus Torvalds <torvalds@linux-foundation.org> 1255559508 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255559508 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  watchdog: Fix rio watchdog probe function
  sparc64: Set IRQF_DISABLED on LDC channel IRQs.
  sparc64: Fix D-cache flushing on swapin from SW devices.
  sparc64: Fix niagara2 perf IRQ bits.