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)
commit1d7123299d8639e60bea3def60577a1bfee584f7
tree3a59cc9f99fa7120a63f1437664260a0a88db570
parent042c5cb741f7682c6f3fc30c3e5248db9517cb28
parent83bce1182d983be01f3247f974654cdac5690436
Merge branch 'tracking-armlt-hdlcd' into lsk-3.10-vexpress
drivers/video/Kconfig
drivers/video/Makefile