tree d973f9ffe5cfe9e8529091d174099bdaa803ac26
parent 747be6e0506777653972ef25cc10c429db34af9f
author Jim Huang <jserv@0xlab.org> 1325353107 +0800
committer Jim Huang <jserv@0xlab.org> 1325353107 +0800

Merge branch 'HEAD', remote-tracking branch 'linaro/linaro-master'