From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Mar 2008 23:12:25 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.25-rc8~71
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7529963cb9c5db6821f0a00fc8426ebed79fc2e0;p=linux-2.6

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
---

7529963cb9c5db6821f0a00fc8426ebed79fc2e0