From: ddl <ddl@rockchip.com>
Date: Sat, 13 Aug 2011 02:44:01 +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~9775
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c8b53937472d6d74ab87772cdde0a5484a90f4d4;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
---

c8b53937472d6d74ab87772cdde0a5484a90f4d4