From: Wolfgang Denk <wd@denx.de>
Date: Wed, 12 Oct 2011 20:45:30 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2011.12-rc1~536
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0dd78fb9430e57ccc8e63369c6082b1c730f8aeb;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Change DDR2 CL from 4 to 5 for intip
  ppc4xx: Improve lm63 pwm on dlvision-10g
  ppc4xx: Do not stop booting on any keypress on intip
---

0dd78fb9430e57ccc8e63369c6082b1c730f8aeb