Merge branch 'for-v2013.04'
authorAnatolij Gustschin <agust@denx.de>
Fri, 29 Mar 2013 12:54:10 +0000 (13:54 +0100)
committerAnatolij Gustschin <agust@denx.de>
Fri, 29 Mar 2013 12:54:10 +0000 (13:54 +0100)
commitd0f34f10f14853ebe3f75371533708aa0639d830
tree5e6bf57ff36e9e52c1a3d78a083883eca73978c4
parent009d75ccc11d27b9a083375a88bb93cb746b4800
parentacf3baad23586bcaf9af608b8c31949ab54e8338
Merge branch 'for-v2013.04'

Conflicts:
drivers/video/Makefile

Signed-off-by: Anatolij Gustschin <agust@denx.de>
common/lcd.c
drivers/video/Makefile