linux/drivers
Olof Johansson 54d69df584 Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-10-04 20:17:25 -07:00
..
accessibility
acpi ACPI / PM: Use KERN_DEBUG when no power resources are found 2012-09-14 20:54:44 +02:00
amba
ata Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
atm
auxdisplay
base mm: cma: fix alignment requirements for contiguous regions 2012-08-28 21:01:01 +02:00
bcma
block Merge branch 'for-linus' of git://git.kernel.dk/linux-block 2012-08-25 11:36:43 -07:00
bluetooth These fixes are needed to fix non-omap build breakage for 2012-09-22 10:00:11 -06:00
cdrom
char hwrng: OMAP: remove SoC restrictions from driver registration 2012-09-23 17:28:27 -06:00
clk Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
clocksource ARM: bcm2835: add system timer 2012-09-19 19:08:46 -06:00
connector
cpufreq Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 2012-08-23 17:02:42 +02:00
cpuidle cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify 2012-08-17 19:37:08 +02:00
crypto Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 13:24:09 -07:00
dca
devfreq
dio
dma Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
edac
eisa
extcon This is the remaining MFD fixes for 3.6, with 5 pending fixes: 2012-09-16 13:22:21 -07:00
firewire
firmware
gpio Merge branch 'kirkwood/drivers' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:23:11 -07:00
gpu drm/nouveau: fix booting with plymouth + dumb support 2012-09-14 15:45:01 +10:00
hid Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2012-09-07 12:29:38 -07:00
hsi
hv
hwmon Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 13:24:09 -07:00
hwspinlock
i2c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
ide ide: fix generic_ide_suspend/resume Oops 2012-08-21 14:54:42 -07:00
idle intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it. 2012-08-17 19:37:14 +02:00
ieee802154
iio drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR 2012-08-27 21:15:25 +01:00
infiniband Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next 2012-08-16 09:38:39 -07:00
input Merge branch 'next/multiplatform' into late/kirkwood 2012-09-22 13:13:45 -07:00
iommu
irqchip ARM: bcm2835: add interrupt controller driver 2012-09-19 19:08:37 -06:00
isdn These fixes are needed to fix non-omap build breakage for 2012-09-22 10:00:11 -06:00
leds ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
lguest
macintosh
md md/raid10: fix problem with on-stack allocation of r10bio structure. 2012-08-18 09:51:42 +10:00
media Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
memory
memstick
message
mfd These fixes are needed to fix non-omap build breakage for 2012-09-22 10:00:11 -06:00
misc Merge 3.6-rc3 into tty-next 2012-08-27 07:13:33 -07:00
mmc Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mtd Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
net Merge branch 'next/multiplatform' into late/kirkwood 2012-09-22 13:13:45 -07:00
nfc
nubus
of dt: introduce for_each_available_child_of_node, of_get_next_available_child 2012-08-20 02:16:00 -07:00
oprofile
parisc
parport parport: fix possible memory leak in parport_gsc_probe_port() 2012-09-05 16:34:22 -07:00
pci PCI: Don't print anything while decoding is disabled 2012-08-23 10:53:08 -06:00
pcmcia Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
pinctrl Merge branch 'kirkwood/drivers' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:23:11 -07:00
platform thinkpad_acpi: buffer overflow in fan_get_status() 2012-09-13 16:46:31 -04:00
pnp
power ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ 2012-09-12 18:06:30 -07:00
pps
ps3
ptp
pwm pwm: pwm-tiehrpwm: Fix conflicting channel period setting 2012-09-10 17:04:38 +02:00
rapidio rapidio/tsi721: fix unused variable compiler warning 2012-08-21 16:45:03 -07:00
regulator ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
remoteproc ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
rpmsg
rtc Device tree related changes for omaps. 2012-09-20 13:22:20 -07:00
s390 Merge branch 'depends/tty-omap-serial' into next/cleanup 2012-09-16 20:04:39 -07:00
sbus
scsi Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
sfi
sh ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
sn
spi Merge branch 'late/kirkwood' into late/soc 2012-10-04 20:17:25 -07:00
ssb
staging These fixes are needed to fix non-omap build breakage for 2012-09-22 10:00:11 -06:00
target target: go through normal processing for zero-length REQUEST_SENSE 2012-09-07 11:32:54 -07:00
tc
thermal
tty Merge branch 'next/multiplatform' into late/kirkwood 2012-09-22 13:13:45 -07:00
uio
usb These fixes are needed to fix non-omap build breakage for 2012-09-22 10:00:11 -06:00
uwb
vfio vfio: grab vfio_device reference *before* exposing the sucker via fd_install() 2012-08-22 10:26:42 -04:00
vhost tcm_vhost: Fix vhost_scsi_target structure alignment 2012-08-20 14:52:11 -07:00
video Merge branch 'next/multiplatform' into late/kirkwood 2012-09-22 13:13:45 -07:00
virt
virtio
vlynq
vme
w1 W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h 2012-09-12 18:06:30 -07:00
watchdog This branch contains changes needed to make omap2+ 2012-09-16 20:05:06 -07:00
xen xen/pciback: Fix proper FLR steps. 2012-09-06 09:22:02 -04:00
zorro
Kconfig ARM: bcm2835: add interrupt controller driver 2012-09-19 19:08:37 -06:00
Makefile ARM: bcm2835: add interrupt controller driver 2012-09-19 19:08:37 -06:00