Arnd Bergmann
f54ae513d3
Merge branch 'spear/dwdma' into late/cleanup ...
This is a series originally prepared for inclusion in 3.9, which did
not work out because of dependencies on the dmaengine driver. All the
changes for the dmaengine code are merged in 3.9 now, so we can finally
do the switchover and remove the now unnecessary dma definitions for
spear13xx from the platform code.
The dma platform_data actually made up the majority of the spear13xx
platform code overall, so moving that into device tree files makes the
code substantially smaller.
* spear/dwdma:
ata: arasan: remove the need for platform_data
ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT
serial: pl011: use generic DMA slave configuration if possible
spi: pl022: use generic DMA slave configuration if possible
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-04-19 22:50:52 +02:00
PCI updates for v3.9:
2013-04-05 19:29:36 -07:00
ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
2013-03-15 17:20:02 +00:00
Merge branch 'spear/dwdma' into late/cleanup
2013-04-19 22:50:52 +02:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ACPI and power management fixes for 3.9-rc6
2013-04-04 15:56:28 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-03-01 13:52:03 -05:00
loop: prevent bdev freeing while device in use
2013-04-01 15:48:47 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2013-03-18 15:17:11 -04:00
One reversion, a tiny leak fix, and a cc:stable locking fix, in two parts.
2013-04-01 16:17:52 -07:00
Merge branch 'spear/multiplatform' into late/cleanup
2013-04-19 22:50:01 +02:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
proc connector: reject unprivileged listener bumps
2013-02-27 13:08:35 -05:00
cpufreq: Correct header guards typo
2013-04-02 15:14:29 +02:00
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
Revert "crypto: caam - add IPsec ESN support"
2013-03-21 17:36:03 +08:00
dca: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-04-03 10:48:22 -07:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
EISA/PCI: Init EISA early, before PNP
2013-04-01 12:02:05 -06:00
extcon: max77693: Initialize register of MUIC device to bring up it without platform data
2013-03-13 17:38:57 +09:00
firewire: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
2013-03-22 20:08:01 +00:00
Two GPIO fixes for the v3.9 series:
2013-04-04 08:40:14 -07:00
PCI updates for v3.9:
2013-04-05 19:29:36 -07:00
HID: magicmouse: fix race between input_register() and probe()
2013-04-04 09:49:56 +02:00
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts
2013-02-27 10:15:53 -08:00
hwmon: (lm75.h) Update header inclusion
2013-03-18 21:19:49 +01:00
ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
2013-04-02 15:30:41 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
First round of iio fixes post the 3.9 merge window.
2013-03-06 05:48:24 +08:00
firmware,IB/qib: revert firmware file move
2013-04-05 12:19:39 -07:00
arm-soc: bug fixes for 3.9-rc3
2013-03-18 08:17:14 -07:00
IOMMU fixes for Linux v3.9-rc4
2013-03-27 09:25:11 -07:00
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
irqchip: armada-370-xp: slightly cleanup irq controller driver
2013-04-15 19:35:17 +00:00
isdn: hisax: netjet requires VIRT_TO_BUS
2013-03-17 12:01:10 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-02-26 09:29:02 -08:00
All trivial, thanks to the stuff which didn't quite make it time.
2013-02-26 14:49:12 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
mailbox, pl320-ipc: remove __init from probe function
2013-03-04 14:23:11 +01:00
dm cache: reduce bio front_pad size in writeback mode
2013-04-05 15:36:34 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2013-04-04 08:40:45 -07:00
memstick: move the dereference below the NULL test
2013-02-27 19:10:23 -08:00
mfd: twl4030-madc: Remove __exit_p annotation
2013-03-15 07:42:22 +01:00
VMCI: Fix process-to-process DRGAMs.
2013-03-15 12:58:12 -07:00
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus
2013-03-03 00:32:50 +00:00
MTD fixes for 3.9
2013-03-18 08:27:41 -07:00
ixgbe: fix registration order of driver and DCA nofitication
2013-04-05 00:49:13 -04:00
NFC: microread: Fix build failure due to a new MEI bus API
2013-04-01 00:52:42 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-02-21 17:54:03 -08:00
PCI/PM: Disable runtime PM of PCIe ports
2013-04-03 15:54:59 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
Here are a few pinctrl fixes for the v3.9 rc series:
2013-03-24 10:11:29 -07:00
Platform: x86: chromeos_laptop : Add basic platform data for atmel devices
2013-03-08 16:03:29 -08:00
ACPI / glue: Add .match() callback to struct acpi_bus_type
2013-03-04 14:23:40 +01:00
power: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
drivers/pps/clients/pps-gpio.c: use devm_kzalloc
2013-02-27 19:10:23 -08:00
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
Merge remote-tracking branch 'regulator/fix/twl' into tmp
2013-03-05 10:12:43 +08:00
remoteproc: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rpmsg: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR"
2013-04-05 09:36:53 -07:00
s390/3270: fix minor_start issue
2013-03-21 13:35:39 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
libfcoe: Fix fcoe_sysfs VN2VN mode
2013-03-25 16:04:22 -07:00
Merge branch 'spear/dwdma' into late/cleanup
2013-04-19 22:50:52 +02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
2013-02-22 10:07:30 +01:00
staging: comedi: s626: fix continuous acquisition
2013-03-25 11:35:38 -07:00
target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
2013-03-28 23:42:47 -07:00
thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.
2013-03-11 23:09:29 +08:00
Merge branch 'spear/dwdma' into late/cleanup
2013-04-19 22:50:52 +02:00
uio: convert to idr_alloc()
2013-02-27 19:10:19 -08:00
USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()
2013-04-02 01:25:09 +02:00
vfio: include <linux/slab.h> for kmalloc
2013-03-15 12:58:20 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-03-30 13:13:05 -07:00
Display related clean-up from Tomi Valkeinen.
2013-04-19 11:40:52 -07:00
All trivial, thanks to the stuff which didn't quite make it time.
2013-02-26 14:49:12 -08:00
w1: fix oops when w1_search is called from netlink connector
2013-03-12 16:20:46 -07:00
watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2
2013-03-22 23:21:55 +01:00
Bug-fixes:
2013-03-27 12:56:25 -07:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
f54ae513d3