Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2008 16:26:43 +0000 (08:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2008 16:26:43 +0000 (08:26 -0800)
commitcdf0c7de29a87cc600ef367893523ea15938da4e
tree00997f8ea89c0bfe7a1f23f12a6780f6319bb542
parentf3179748a157c21d44d929fd3779421ebfbeaa93
parentab44f4627e2160cddbddbe8aa8b1d2b2e1559790
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/virtex5: Fix Virtex5 machine check handling