Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 7 Dec 2011 08:07:28 +0000 (09:07 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Dec 2011 08:07:28 +0000 (09:07 +0100)
commit99dee4b2ef570f289e2b1f105df0fdb8ad57ebd1
treee46d8c008a16f782dd259952b55416f9f0e4f9ad
parent9294fd60ae273cc7a2759a48a081a5cc655ddf23
parent4497861ae7e52dda4dd13db860df4cc0fa7dd852
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  p2041rdb: fix serdes clock map