| commit | 974a847e00cf3ff1695e62b276892137893706ab | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu Sep 20 16:14:25 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 01 19:39:48 2012 -0700 |
| tree | a9454dc32de4738c463f514c37b35106d1e9b2e9 | |
| parent | 9cd11c0c47b8690b47e7573311ce5c483cb344ed [diff] |
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>