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)
commitc9091f9e571386992c8c5badcec84d49753b9df1
treedf53ffae8b44ae0be843ffe4430bd36461248131
parentcc2020e62dd607ef907bb44325ac95cbb5b76eb2
parent13c501e69c3fba3ca0651abcc4aa7c9091fda70a
Merge branch 'for-2.6.26' of git://git./linux/kernel/git/jwboyer/powerpc-4xx

* 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
  [POWERPC] 4xx: Workaround for CHIP_11 Errata