projects / profile / ivi / kernel-adaptation-intel-automotive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9cd11c0) | patch
drivers: bus: omap_l3: fixup merge conflict resolution
authorOlof Johansson <olof@lixom.net>
Thu, 20 Sep 2012 23:14:25 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Oct 2012 02:39:48 +0000 (19:39 -0700)
commit974a847e00cf3ff1695e62b276892137893706ab
treea9454dc32de4738c463f514c37b35106d1e9b2e9tree | snapshot
parent9cd11c0c47b8690b47e7573311ce5c483cb344edcommit | 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>
drivers/bus/omap_l3_noc.c diff | blob | history
Domain: System / Uncategorized;