Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Mar 2008 23:12:25 +0000 (16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Mar 2008 23:12:25 +0000 (16:12 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] update pasemi_defconfig


Trivial merge