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
..
accessibility
acpi	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
amba
ata	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
atm
auxdisplay
base	Driver core merge for 3.7-rc1	2012-10-01 12:10:44 -07:00
bcma
block	USB merge for 3.7-rc1	2012-10-01 13:23:01 -07:00
bluetooth	Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt	2012-09-22 22:20:37 -07:00
bus	drivers: bus: omap_l3: fixup merge conflict resolution	2012-10-01 19:39:48 -07:00
cdrom
char	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00
clk	ARM: soc: soc-specific updates, take 2	2012-10-01 18:35:58 -07:00
clocksource	ARM: soc: soc-specific updates	2012-10-01 18:24:44 -07:00
connector
cpufreq	Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-09-19 11:00:07 -07:00
cpuidle
crypto	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
dca
devfreq
dio
dma	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
edac	sb_edac: Avoid overflow errors at memory size calculation	2012-09-25 07:38:20 -03:00
eisa
extcon	Driver core merge for 3.7-rc1	2012-10-01 12:10:44 -07:00
firewire
firmware
gpio	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00
gpu	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
hid	Staging tree update for 3.7-rc1	2012-10-01 12:11:39 -07:00
hsi
hv
hwmon	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
hwspinlock
i2c	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
ide
idle
ieee802154
iio	iio: adc: add new lp8788 adc driver	2012-09-22 10:29:19 +01:00
infiniband	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
input	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
iommu	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
irqchip	irqchip: fill in empty Kconfig	2012-09-24 10:07:40 -07:00
isdn	Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt	2012-09-22 22:20:37 -07:00
leds	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
lguest	lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models	2012-09-18 15:52:09 -07:00
macintosh
md	A few fixes for problems discovered during the 3.6 cycle.	2012-09-28 10:00:01 -07:00
media	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
memory	memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()	2012-09-26 14:04:09 -07:00
memstick
message
mfd	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
misc	TTY merge for 3.7-rc1	2012-10-01 12:26:52 -07:00
mmc	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
mtd	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
net	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
pcmcia	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
pinctrl	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00
platform
pnp
power	ARM: soc: general cleanups	2012-10-01 18:19:05 -07:00
pps
ps3
ptp
pwm
rapidio
regulator	Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next	2012-09-28 14:45:07 +01:00
remoteproc	ARM: omap: move platform_data definitions	2012-09-19 17:39:52 +02:00
rpmsg
rtc	ARM: soc: device tree updates	2012-10-01 18:28:06 -07:00
s390	TTY merge for 3.7-rc1	2012-10-01 12:26:52 -07:00
sbus
scsi	ARM: soc: general cleanups	2012-10-01 18:19:05 -07:00
sfi
sh	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
sn
spi	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
ssb
staging	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
tc
thermal
tty	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
uio
usb	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
uwb
vfio	vfio: Fix virqfd release race	2012-09-21 10:48:28 -06:00
vhost
video	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
virt
virtio
vlynq
vme
w1	char/misc driver merge for 3.7-rc1	2012-10-01 12:09:59 -07:00
watchdog	ARM: soc: general cleanups	2012-10-01 18:19:05 -07:00
xen	USB merge for 3.7-rc1	2012-10-01 13:23:01 -07:00
zorro
Kconfig	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00
Makefile	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00