Merge branch 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 23:36:28 +0000 (16:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 23:36:28 +0000 (16:36 -0700)
* 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
  [POWERPC] 4xx: Workaround for CHIP_11 Errata


Trivial merge