[GIT PULL 4/8] arm-soc: clock driver changes

On Sat, May 26, 2012 at 12:47 PM, Linus Torvalds
[off-list ref] wrote:

On Sat, May 26, 2012 at 12:22 AM, Olof Johansson [off-list ref] wrote:

quoted

?151 files changed, 8310 insertions(+), 14192 deletions(-)

Judging by the diffstat, I think we resolved this differently.

I also removed the

?#include <linux/of.h>

from mach-kirkwood/common.c, since the OF users all got removed. You
have one less lines deleted than I do, which makes me think you didn't
remove that header file include.

But I didn't actually check. I thought I'd mention it, just so that it
doesn't come back (or, assuming I did the wrong thing, you fix it up
and put it back)

Good catch. Yes, I did indeed keep it and there is no need to do so
since it was only used in the code that got removed. Your resolution
is good. Thanks for the heads up.


Regards,

-Olof