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
2012-10-01 12:05:36 -07:00
2012-09-22 01:07:21 -07:00
2012-10-01 12:10:44 -07:00
2012-10-01 13:23:01 -07:00
2012-09-22 22:20:37 -07:00
2012-10-01 19:39:48 -07:00
2012-10-01 18:46:13 -07:00
2012-10-01 18:35:58 -07:00
2012-10-01 18:24:44 -07:00
2012-09-19 11:00:07 -07:00
2012-08-17 19:37:08 +02:00
2012-09-22 01:07:21 -07:00
2012-10-01 19:11:38 -07:00
2012-09-25 07:38:20 -03:00
2012-10-01 12:10:44 -07:00
2012-09-10 16:40:30 -07:00
2012-10-01 18:46:13 -07:00
2012-10-01 12:05:36 -07:00
2012-10-01 12:11:39 -07:00
2012-09-05 12:12:38 -07:00
2012-10-01 19:11:38 -07:00
2012-09-10 13:19:25 +03:00
2012-10-01 19:11:38 -07:00
2012-08-21 14:54:42 -07:00
2012-08-17 19:37:14 +02:00
2012-09-22 10:29:19 +01:00
2012-10-01 12:05:36 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 12:05:36 -07:00
2012-09-24 10:07:40 -07:00
2012-09-22 22:20:37 -07:00
2012-10-01 19:11:38 -07:00
2012-09-18 15:52:09 -07:00
2012-09-11 08:57:43 +02:00
2012-09-28 10:00:01 -07:00
2012-10-01 19:11:38 -07:00
2012-09-26 14:04:09 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 12:26:52 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 19:11:38 -07:00
2012-08-20 02:16:00 -07:00
2012-08-27 14:49:39 +02:00
2012-08-22 11:34:38 -06:00
2012-09-05 16:34:22 -07:00
2012-10-01 12:05:36 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 18:46:13 -07:00
2012-09-13 16:46:31 -04:00
2012-10-01 18:19:05 -07:00
2012-09-10 17:04:38 +02:00
2012-09-13 08:41:01 -06:00
2012-09-28 14:45:07 +01:00
2012-09-19 17:39:52 +02:00
2012-09-12 12:03:57 +03:00
2012-10-01 18:28:06 -07:00
2012-10-01 12:26:52 -07:00
2012-10-01 18:19:05 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 09:06:36 -07:00
2012-10-01 19:11:38 -07:00
2012-10-01 19:11:38 -07:00
2012-09-21 10:48:28 -06:00
2012-08-20 14:52:11 -07:00
2012-10-01 19:11:38 -07:00
2012-09-06 13:29:11 -07:00
2012-10-01 12:09:59 -07:00
2012-10-01 18:19:05 -07:00
2012-10-01 13:23:01 -07:00
2012-10-01 18:46:13 -07:00
2012-10-01 18:46:13 -07:00
974a847e00