FYI, this patch should be From: Ming Lin <ming.l at ssi.samsung.com> unfortunately git is really eager to lose these when having the slightest conflicts in a rebase..