From: Wolfgang Denk <wd@denx.de>
Date: Fri, 21 Oct 2011 21:48:46 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2011.12-rc1~510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02aff558f4b68927c719a33bee8d13d325d105fb;p=kernel%2Fu-boot.git

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
---

02aff558f4b68927c719a33bee8d13d325d105fb