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 pasemi_defconfig
This commit is contained in:
Linus Torvalds 2008-03-27 16:12:25 -07:00
commit 7529963cb9