tree 103e47282bff13fca727ead367f6cd95fa44c01f
parent 75d95062185c60356a423f7ab9e975b4293ec4f3
parent cd5aeb9f6cf7ada6baa218e01b4299e201497cde
author Linus Torvalds <torvalds@linux-foundation.org> 1219247073 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219247073 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix vio_bus_probe oops on probe error
  powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices
  powerpc: Fix /dev/oldmem interface for kdump
  powerpc/spufs: Remove invalid semicolon after if statement
  powerpc/spufs: reference context while dropping state mutex in scheduler
  powerpc/spufs: fix npc setting for NOSCHED contexts