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

[Linus Torvalds]

On Sat, May 26, 2012 at 12:22 AM, Olof Johansson <olof at lixom.net> wrote:
>
>  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)

                  Linus