[PATCH] clk: qcom: Remove accidental merged reject file

[Sergei Shtylyov]

Hello.

On 04/30/2014 10:15 PM, Kumar Gala wrote:

> Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally

    Please also specify that commit's summary in parens.

> added in a merge reject file, so remove it.

> Signed-off-by: Kumar Gala <galak at codeaurora.org>

WBR, Sergei