tree 5367b3e7325306239e82dd5af922f059a0d5983d
parent 3085354de635179d70c240e6d942bcbd1d93056c
parent 5c29934de29ddd7ecd913d83cad28e872f2e8c78
author Linus Torvalds <torvalds@linux-foundation.org> 1206659545 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206659545 -0700

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