Linus Torvalds 41f2a93cc6 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm ... Pull ARM fixes from Russell King: "A set of ARM fixes: - fix an off-by-one error in the iommu DMA ops, which caused errors with a 4GiB size. - remove comments mentioning the non-existent CONFIG_CPU_ARM1020_CPU_IDLE macro. - remove useless CONFIG_CPU_ICACHE_STREAMING_DISABLE blocks, where this symbol never appeared in any Kconfig. - fix Feroceon code to cope with a previous change correctly (it incorrectly left an additional word in an assembly structure definition) - avoid a misleading IRQ affinity warning in the ARM PMU code for IRQs which are already affine to their CPUs. - fix the node name printed in the IRQ affinity warning" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8352/1: perf: Fix the pmu node name in warning message ARM: 8351/1: perf: don't warn about missing interrupt-affinity property for PPIs ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block ARM: 8348/1: remove comments on CPU_ARM1020_CPU_IDLE ARM: 8347/1: dma-mapping: fix off-by-one check in arm_setup_iommu_dma_ops		2015-05-10 11:16:48 -07:00
..
boot	Samsung fixes for v4.1	2015-05-10 11:13:19 -07:00
common	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
configs	ARM: multi_v7_defconfig: Select more FSL SoCs	2015-05-07 18:31:00 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
firmware	…
include	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-05-10 11:16:48 -07:00
kernel	ARM: 8352/1: perf: Fix the pmu node name in warning message	2015-05-03 23:23:44 +01:00
kvm	This mostly includes the PPC changes for 4.1, which this time cover	2015-04-26 13:06:22 -07:00
lib	ARM: ensure delay timer has sufficient accuracy for delays	2015-04-14 22:28:07 +01:00
mach-alpine	ARM: alpine: add support for generic pci	2015-04-14 01:15:57 +02:00
mach-asm9260	…
mach-at91	Fourth batch of cleanup for 4.1:	2015-04-14 01:50:21 +02:00
mach-axxia	…
mach-bcm	ARM: cygnus: fix const declaration bcm_cygnus_dt_compat	2015-03-24 15:13:23 -07:00
mach-berlin	…
mach-clps711x	…
mach-cns3xxx	ARM: cns3xxx: don't export static symbol	2015-03-13 11:02:15 +01:00
mach-davinci	ARM: DT updates for v4.1	2015-04-22 09:09:46 -07:00
mach-digicolor	…
mach-dove	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	…
mach-exynos	ARM: SoC driver updates for v4.1	2015-04-22 09:18:17 -07:00
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address	2015-04-27 20:37:06 +08:00
mach-integrator	…
mach-iop13xx	…
mach-iop32x	…
mach-iop33x	…
mach-ixp4xx	…
mach-keystone	…
mach-ks8695	…
mach-lpc32xx	…
mach-mediatek	ARM: mediatek: enable the pin controller	2015-03-10 14:31:10 +01:00
mach-meson	…
mach-mmp	…
mach-moxart	…
mach-mv78xx0	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-mvebu	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-mxs	…
mach-netx	…
mach-nomadik	…
mach-nspire	…
mach-omap1	ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs	2015-03-16 16:09:23 -07:00
mach-omap2	ARM: OMAP2+: Fix omap off idle power consumption creeping up	2015-05-04 08:54:41 -07:00
mach-orion5x	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-picoxcell	…
mach-prima2	…
mach-pxa	ARM: pxa: lubbock: use new pxa_cplds driver	2015-04-30 22:52:51 +02:00
mach-qcom	firmware: qcom: scm: Clean cold boot entry to export only the API	2015-03-11 15:15:05 -05:00
mach-realview	…
mach-rockchip	rockchip: make sure timer7 is enabled on rk3288 platforms	2015-04-16 21:22:17 +02:00
mach-rpc	…
mach-s3c24xx	…
mach-s3c64xx	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-s5pv210	ARM: 8326/1: s5pv210: move resume code to .text section	2015-03-29 23:11:58 +01:00
mach-sa1100	ARM: fix typos in smc91x platform data	2015-03-04 23:32:26 -05:00
mach-shmobile	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
mach-socfpga	…
mach-spear	…
mach-sti	ARM: STi: Add STiH410 SoC support	2015-03-11 15:34:45 +01:00
mach-sunxi	…
mach-tegra	Power management and ACPI updates for v4.1-rc1	2015-04-14 20:21:54 -07:00
mach-u300	…
mach-ux500	ARM: ux500: switch from gic_arch_extn to gic_set_irqchip_flags	2015-03-15 01:28:11 +00:00
mach-versatile	…
mach-vexpress	ARM: SoC driver updates for v4.1	2015-04-22 09:18:17 -07:00
mach-vt8500	…
mach-w90x900	…
mach-zynq	ARM: zynq: switch from gic_arch_extn to gic_set_irqchip_flags	2015-03-15 01:28:12 +00:00
mm	ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro	2015-05-03 23:23:09 +01:00
net	…
nwfpe	ARM: 8322/1: keep .text and .fixup regions closer together	2015-03-29 23:11:56 +01:00
oprofile	…
plat-iop	…
plat-omap	ARM, clocksource/drivers: Provide read_boot_clock64() and read_persistent_clock64() and use them	2015-04-03 08:18:23 +02:00
plat-orion	…
plat-pxa	ARM: plat-pxa: remove use of seq_printf return value	2015-04-15 16:35:25 -07:00
plat-samsung	…
plat-versatile	…
probes	…
tools	…
vdso	ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile	2015-04-21 15:28:02 +01:00
vfp	…
xen	xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM	2015-05-06 15:02:58 +01:00
Kconfig	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Kconfig-nommu	…
Kconfig.debug	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Makefile	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00