Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Mon, 18 Jul 2011 19:03:08 +0000 (21:03 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Jul 2011 19:03:08 +0000 (21:03 +0200)
commit1c6d00c2b5f090f5ae9b0d5cd9cf9a0adfdd2c77
treefa63ea5e17706836fdc6c0a137a1d15f8cf694cb
parenta28afca57df7875f3334407bc47bd66b98701534
parent4f1d1b7d1e647b4e0ffd9b9feedd02110d078bdb
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/p2041rdb: Add p2041rdb board support
  powerpc/85xx: Fix detection of P1017E
  powerpc/mpc8548cds: Remove incorrect DDR_MSYNC_IN erratum define