linux/drivers/bus
Olof Johansson 974a847e00 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>
2012-10-01 19:39:48 -07:00
..
Kconfig
Makefile
omap-ocp2scp.c
omap_l3_noc.c drivers: bus: omap_l3: fixup merge conflict resolution 2012-10-01 19:39:48 -07:00
omap_l3_noc.h
omap_l3_smx.c
omap_l3_smx.h