From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 12 May 2015 06:53:40 +0000 (+0800)
Subject:  Merge tag 'v3.10.77' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~8^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8134585f1c33565ea5e752a7ba9323ed3e0921f3;p=firefly-linux-kernel-4.4.55.git

 Merge tag 'v3.10.77' into linux-linaro-lsk

 This is the 3.10.77 stable release

 Conflicts:
	drivers/video/console/Kconfig
	scripts/kconfig/menu.c
---

8134585f1c33565ea5e752a7ba9323ed3e0921f3