linux-stable/arch/arm
Olof Johansson afcf7924ec Merge branch 'fixes' into next/cleanup
Merging in fixes since there's a conflict in the omap4 clock tables caused by
it.

* fixes: (245 commits)
  ARM: highbank: fix cache flush ordering for cpu hotplug
  ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
  arm: mvebu: Fix the irq map function in SMP mode
  Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
  ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
  ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
  ARM i.MX6: Fix ldb_di clock selection
  ARM: imx: provide twd clock lookup from device tree
  ARM: imx35 Bugfix admux clock
  ARM: clk-imx35: Bugfix iomux clock
  + Linux 3.9-rc6

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-omap2/cclock44xx_data.c
2013-04-28 15:01:12 -07:00
..
boot Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
common
configs Merge branch 'next/spring-cleaning' into next/cleanup 2013-04-19 17:18:46 +02:00
crypto
include Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
kernel Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
kvm Merge branch 'kvm-arm/vgic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into fixes 2013-03-22 17:10:35 +00:00
lib ARM: 7685/1: delay: use private ticks_per_jiffy field for timer-based delay ops 2013-04-03 16:45:50 +01:00
mach-at91 Trivial typos and some macros removal & modification 2013-04-09 15:37:28 +02:00
mach-bcm
mach-bcm2835 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-clps711x
mach-cns3xxx ARM: cns3xxx: fix mapping of private memory region 2013-03-30 12:05:26 -07:00
mach-davinci ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830 2013-03-12 17:10:46 +05:30
mach-dove arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ebsa110
mach-ep93xx ARM: ep93xx: Fix wait for UART FIFO to be empty 2013-03-18 09:40:38 +11:00
mach-exynos cleanup unused codes for samsung 2013-04-09 15:31:57 +02:00
mach-footbridge ARM: fix CONFIG_VIRT_TO_BUS handling 2013-03-18 13:49:57 +00:00
mach-gemini ARM: gemini: get platform to build again 2013-03-14 21:14:03 +01:00
mach-highbank Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-imx Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-integrator Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop13xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-kirkwood Fix GE0/GE1 init on ix2-200 as GE0 has no PHY 2013-04-10 16:50:58 +00:00
mach-ks8695 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-lpc32xx
mach-mmp ARM: mmp: add platform_device head file in gplugd 2013-03-15 16:27:53 +08:00
mach-msm Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-mv78xx0 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mvebu arm: mvebu: Fix the irq map function in SMP mode 2013-04-10 16:59:14 +00:00
mach-mxs ARM: mxs: remove unused headers 2013-04-01 20:42:23 +08:00
mach-netx ARM: 7642/1: netx: bump IRQ offset to 64 2013-03-03 22:54:11 +00:00
mach-nomadik Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-omap1 Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-omap2 Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-orion5x arm: mach-orion5x: use mv_mbus_dram_info() in PCI code 2013-03-17 18:03:48 +00:00
mach-picoxcell
mach-prima2 irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
mach-pxa ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-realview arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-rpc
mach-s3c24xx Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-s3c64xx ARM: SAMSUNG: Remove unnecessary code for dma 2013-04-08 21:42:10 +09:00
mach-s5p64x0 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-s5pc100 ARM: S5PC100: remove useless ifdef in common.h 2013-03-05 18:37:10 +09:00
mach-s5pv210 Linux 3.9-rc5 2013-04-09 15:29:43 +02:00
mach-sa1100 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-shark
mach-shmobile Linux 3.9-rc5 2013-04-09 15:29:43 +02:00
mach-socfpga irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
mach-spear3xx ARM: spear3xx: Use correct pl080 header file 2013-03-12 10:56:32 +01:00
mach-spear6xx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
mach-spear13xx Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 into next/cleanup 2013-04-02 10:59:28 -07:00
mach-sunxi ARM: sunxi: Rework the restart code 2013-04-08 21:43:08 +02:00
mach-tegra ARM: tegra: cleanup 2013-04-09 15:27:52 +02:00
mach-u300 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-ux500 Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
mach-versatile Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-vexpress ARM: smp_twd: convert to use CLKSRC_OF init 2013-03-11 08:42:08 -05:00
mach-virt irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
mach-vt8500 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-w90x900 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-zynq
mm ARM: 7684/1: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations) 2013-04-03 16:45:49 +01:00
net ARM:net: an issue for k which is u32, never < 0 2013-03-12 11:33:05 -04:00
nwfpe
oprofile
plat-iop
plat-omap arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
plat-orion Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 into next/cleanup 2013-04-02 10:59:28 -07:00
plat-pxa
plat-samsung cleanup unused codes for samsung 2013-04-09 15:31:57 +02:00
plat-spear ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ" 2013-03-05 23:30:24 +01:00
plat-versatile irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
tools
vfp ARM: Fix broken commit 0cc41e4a21 corrupting kernel messages 2013-03-01 21:09:59 +00:00
xen xen: implement updated XENMEM_add_to_physmap_range ABI 2013-02-19 22:01:55 -05:00
Kconfig Merge branch 'fixes' into next/cleanup 2013-04-28 15:01:12 -07:00
Kconfig-nommu
Kconfig.debug ARM: imx: add dependency check for DEBUG_IMX_UART_PORT 2013-03-19 13:56:05 +08:00
Makefile ARM: kill Hynix h720x platform 2013-03-19 21:59:59 +01:00