tree a9454dc32de4738c463f514c37b35106d1e9b2e9
parent 9cd11c0c47b8690b47e7573311ce5c483cb344ed
author Olof Johansson <olof@lixom.net> 1348182865 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1349145588 -0700

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>