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)
commit7529963cb9c5db6821f0a00fc8426ebed79fc2e0
tree5367b3e7325306239e82dd5af922f059a0d5983d
parent3085354de635179d70c240e6d942bcbd1d93056c
parent5c29934de29ddd7ecd913d83cad28e872f2e8c78
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] update pasemi_defconfig