Merge branch 'tracking-armlt-hdlcd' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:42 +0000 (12:01 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:42 +0000 (12:01 +0100)
1  2 
drivers/video/Kconfig
drivers/video/Makefile

Simple merge
Simple merge