Linus Torvalds
ecc728467f
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ...
Pull arm CMA fix from Marek Szyprowski:
"This removes the ARMv6+ CMA dependency and lets one use old, well-
tested dma-mapping implementation also on ARMv6+ systems without the
need to use EXPERIMENTAL stuff."
Russell King complained (rightly) about the experimental feature being
forced on by the ARM config.
Here CMA is "continuous memory allocator", not "cross-memory attach".
We really neet to stop using insane TLA's for things that aren't big
industry standards.
* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma-mapping: remove unconditional dependency on CMA
2012-06-05 13:23:17 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
ARM: ux500: Provide regulator support for SMSC911x via Device Tree
2012-06-01 02:04:46 +02:00
include /asm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-06-01 10:34:35 -07:00
new helper: signal_delivered()
2012-06-01 12:58:52 -04:00
ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs
2012-05-05 05:50:50 +01:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
ARM: clps711x: Cleanup IRQ handling
2012-05-15 21:20:59 +02:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
2012-05-21 15:15:10 +01:00
ARM: PCI: get rid of pci_std_swizzle()
2012-05-13 17:12:16 +01:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-l7200/include /mach
GPIO driver changes for v3.5 merge window
2012-05-24 14:01:46 -07:00
arm-soc: board specific changes
2012-05-22 13:32:53 -07:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-05-29 18:21:44 -07:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-06-04 11:25:31 -07:00
arm-soc: soc-specific pinctrl changes
2012-05-22 09:39:42 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
pinctrl: Add SPEAr13xx pinctrl drivers
2012-05-14 17:34:07 +02:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
ARM: u300: bump all IRQ numbers by one
2012-04-20 09:52:58 +02:00
ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot
2012-06-01 02:04:41 +02:00
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
2012-05-21 15:15:10 +01:00
Merge branch 'late/soc' into devel-late
2012-05-30 16:06:46 -07:00
ARM: dma-mapping: remove unconditional dependency on CMA
2012-06-04 08:01:24 +02:00
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
ARM: nomadik: enable PINCTRL_NOMADIK where needed
2012-05-15 14:42:57 +02:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
Input: pxa27x_keypad add choice to set direct_key_mask
2012-04-27 16:50:05 +08:00
ARM: S3C24XX: move common clock init into common.c
2012-05-12 16:22:18 +09:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
arm-soc: soc-specific pinctrl changes
2012-05-22 09:39:42 -07:00
ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller
2012-05-04 16:53:37 +01:00
ARM: Update mach-types
2012-04-26 08:46:02 +01:00
Merge branch 'misc' into for-linus
2012-05-21 15:15:24 +01:00
ARM: dma-mapping: remove unconditional dependency on CMA
2012-06-04 08:01:24 +02:00
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00
ecc728467f