tree 215757279d23a8984cad993679c6be20fe0d6831
parent f82c087e60fe1c59ace1c6f016eb89c5d3c3ae13
parent 710308ee185b3087e474fb9b205f47613c65dda4
author Wolfgang Denk <wd@denx.de> 1319233726 +0200
committer Wolfgang Denk <wd@denx.de> 1319233726 +0200

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

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  mpc85xx: Add inline GPIO acessor functions
  powerpc/85xx: wait for alignment before resetting SERDES RX lanes (SERDES9)
  powerpc/85xx: Fix P2020DS booting
  powerpc/85xx: Update USB device tree status based on pin settings
  fdt: Add new fdt_set_node_status & fdt_set_status_by_alias helpers
  powerpc/85xx: Add support for RMan LIODN initialization
  powerpc/85xx: Update device tree handling for SRIO
  powerpc/85xx: Update setting of SRIO LIODNs
  fm: Don't allow disabling of FM1-DTSEC1
  fm-eth: Don't mark the MAC we use for MDIO as disabled in device tree