From: Olof Johansson <olof@lixom.net>
Date: Thu, 20 Sep 2012 23:14:25 +0000 (-0700)
Subject: drivers: bus: omap_l3: fixup merge conflict resolution
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974a847e00cf3ff1695e62b276892137893706ab;p=pandora-kernel.git

drivers: bus: omap_l3: fixup merge conflict resolution

This fixes a local merge conflict resolution done wrong locally in
arm-soc for-next. soc.h was added on a cleanup branch, but the driver
was moved and the header no longer needed.

Signed-off-by: Olof Johansson <olof@lixom.net>
[ .. and I did the same wrong merge, since git automatically does the
  whole rename detection etc, so applying this patch from Olof  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed