tree b33903197ae17defc3d61b8d8d744a3e87c22686
parent e45521a8d44da2c4efd17fc8e853f7917e99b57a
parent e89debcd18a3ef74b27894e479d6b9e658fc6de6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1169486462 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1169486462 -0800

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] Update defconfigs
  [POWERPC] atomic_dec_if_positive sign extension fix
  [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
  [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
  [POWERPC] Fix broken DMA on non-LPAR pSeries
  [POWERPC] Fix cell's mmio nvram to properly parse device tree
  [POWERPC] Remove bogus sanity check in pci -> OF node code