[coreboot-gerrit] Patch merged into coreboot/master: libpayload: Fix merge of PL011 UART support

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit a7c609c262d5beba968519903fed297dc4b601c1
Author: Nico Huber <nico.huber at secunet.com>
Date:   Wed Sep 9 13:27:09 2015 +0200

    libpayload: Fix merge of PL011 UART support
    
    Wished I hadn't seen that. Git saw the conflict (file was gone), both
    committer and reviewer thought it would be a good idea to re-add it as
    dead code (see 558e9b5: libpayload: Add minimal support for PL011 UART).
    
    Change-Id: Ifea8113fbc59e0463eaedb86b976f54ec11113a9
    Signed-off-by: Nico Huber <nico.huber at secunet.com>
    Reviewed-on: http://review.coreboot.org/11604
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi <pgeorgi at google.com>
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


See http://review.coreboot.org/11604 for details.

-gerrit