Seems to be a left-over from an automatic merge.
Signed-off-by: NMichael Heimpold <mhei@heimpold.de>
Reviewed-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NShawn Guo <shawn.guo@linaro.org>