From: ddl <ddl@rockchip.com>
Date: Thu, 4 Aug 2011 04:29:55 +0000 (+0800)
Subject: Merge branch 'develop-2.6.36' of 10.10.10.29:/home/rockchip/kernel-2.6.36 into develo... 
X-Git-Tag: firefly_0821_release~9779
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ef76efed6603fcca8c435a05621835d78389b5f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-2.6.36' of 10.10.10.29:/home/rockchip/kernel-2.6.36 into develop-2.6.36
---

7ef76efed6603fcca8c435a05621835d78389b5f