tree efd1b486a1eb4b91a61180116b75edb3edb8745e
parent 5e262cde9c33b3ed7724426f15d420b5a32bfe9a
parent dc4841abc89fe5866dacc9de087744564551f84b
author Jim Huang <jserv@0xlab.org> 1331186258 +0800
committer Jim Huang <jserv@0xlab.org> 1331186258 +0800

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