]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 30 May 2014 05:31:46 +0000 (15:31 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 30 May 2014 05:30:23 +0000 (15:30 +1000)]
Merge remote-tracking branch 'tty/tty-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 30 May 2014 05:19:21 +0000 (15:19 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
drivers/iommu/exynos-iommu.c

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 30 May 2014 05:18:12 +0000 (15:18 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Fri, 30 May 2014 05:16:54 +0000 (15:16 +1000)]
Merge remote-tracking branch 'hsi/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 30 May 2014 05:15:31 +0000 (15:15 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 30 May 2014 05:15:23 +0000 (15:15 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 30 May 2014 05:04:25 +0000 (15:04 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:53:24 +0000 (14:53 +1000)]
Merge remote-tracking branch 'percpu/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Fri, 30 May 2014 04:44:39 +0000 (14:44 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Fri, 30 May 2014 04:43:25 +0000 (14:43 +1000)]
Merge remote-tracking branch 'kvm-arm/next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 30 May 2014 04:42:05 +0000 (14:42 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:39:27 +0000 (14:39 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:38:29 +0000 (14:38 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:37:26 +0000 (14:37 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Fri, 30 May 2014 04:36:10 +0000 (14:36 +1000)]
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/boot/dts/vf610.dtsi

10 years agox86,vdso: Fix cross-compilation from big-endian architectures
Andy Lutomirski [Thu, 29 May 2014 21:57:18 +0000 (14:57 -0700)]
x86,vdso: Fix cross-compilation from big-endian architectures

This adds a macro GET(x) to convert x from big-endian to
little-endian.  Hopefully I put it everywhere it needs to go and got
all the cases needed for everyone's linux/elf.h.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
10 years agox86,vdso: When vdso2c fails, unlink the output
Andy Lutomirski [Thu, 29 May 2014 21:57:17 +0000 (14:57 -0700)]
x86,vdso: When vdso2c fails, unlink the output

This avoids bizarre failures if make is run again.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 30 May 2014 04:21:30 +0000 (14:21 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/arm64/include/asm/thread_info.h
arch/arm64/mm/mmu.c
drivers/block/mtip32xx/mtip32xx.c

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 30 May 2014 04:10:26 +0000 (14:10 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
Documentation/kernel-parameters.txt

10 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 30 May 2014 03:59:26 +0000 (13:59 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
arch/arm/mach-vexpress/platsmp.c

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Fri, 30 May 2014 03:57:42 +0000 (13:57 +1000)]
Merge remote-tracking branch 'audit/master'

Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 30 May 2014 03:55:56 +0000 (13:55 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt

10 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 30 May 2014 03:54:58 +0000 (13:54 +1000)]
Merge remote-tracking branch 'osd/linux-next'

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 30 May 2014 03:53:45 +0000 (13:53 +1000)]
Merge remote-tracking branch 'iommu/next'

Conflicts:
drivers/iommu/exynos-iommu.c

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 30 May 2014 03:52:41 +0000 (13:52 +1000)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 30 May 2014 03:51:28 +0000 (13:51 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 30 May 2014 03:41:42 +0000 (13:41 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 30 May 2014 03:40:08 +0000 (13:40 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 30 May 2014 03:38:15 +0000 (13:38 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/boot/dts/am437x-gp-evm.dts

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 30 May 2014 03:25:26 +0000 (13:25 +1000)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 30 May 2014 03:24:02 +0000 (13:24 +1000)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 30 May 2014 03:23:48 +0000 (13:23 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 30 May 2014 03:22:50 +0000 (13:22 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

10 years agoRevert "mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs"
Stephen Rothwell [Fri, 30 May 2014 03:21:23 +0000 (13:21 +1000)]
Revert "mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs"

This reverts commit 19b7f796c375a8098924717b171ac5058129d2c4.

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 30 May 2014 02:44:18 +0000 (12:44 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
include/linux/omap-dma.h

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Fri, 30 May 2014 02:26:45 +0000 (12:26 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 30 May 2014 02:17:01 +0000 (12:17 +1000)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/virtio_blk.c

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 30 May 2014 02:15:48 +0000 (12:15 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 30 May 2014 02:14:43 +0000 (12:14 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 30 May 2014 02:03:29 +0000 (12:03 +1000)]
Merge remote-tracking branch 'modules/modules-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 30 May 2014 02:01:30 +0000 (12:01 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:59:55 +0000 (11:59 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:58:57 +0000 (11:58 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 30 May 2014 01:57:21 +0000 (11:57 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_drv.h

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:56:23 +0000 (11:56 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 30 May 2014 01:54:46 +0000 (11:54 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 30 May 2014 01:53:21 +0000 (11:53 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 30 May 2014 01:48:52 +0000 (11:48 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 30 May 2014 01:47:01 +0000 (11:47 +1000)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 30 May 2014 01:44:44 +0000 (11:44 +1000)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 30 May 2014 01:34:02 +0000 (11:34 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 30 May 2014 01:33:02 +0000 (11:33 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 30 May 2014 01:27:38 +0000 (11:27 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:26:42 +0000 (11:26 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

10 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 30 May 2014 01:25:45 +0000 (11:25 +1000)]
Merge remote-tracking branch 'thermal/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 30 May 2014 01:14:35 +0000 (11:14 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:13:27 +0000 (11:13 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 30 May 2014 01:10:18 +0000 (11:10 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 30 May 2014 01:09:25 +0000 (11:09 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 30 May 2014 01:09:22 +0000 (11:09 +1000)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 30 May 2014 01:06:24 +0000 (11:06 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 30 May 2014 00:55:15 +0000 (10:55 +1000)]
Merge remote-tracking branch 'pci/next'

Conflicts:
arch/s390/pci/pci_sysfs.c

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 30 May 2014 00:44:58 +0000 (10:44 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/file.c
fs/f2fs/file.c
fs/nfs/direct.c
fs/splice.c

10 years agoMerge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Fri, 30 May 2014 00:43:38 +0000 (10:43 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 30 May 2014 00:33:30 +0000 (10:33 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 30 May 2014 00:32:37 +0000 (10:32 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 30 May 2014 00:30:59 +0000 (10:30 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 30 May 2014 00:29:29 +0000 (10:29 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 30 May 2014 00:27:51 +0000 (10:27 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 30 May 2014 00:26:58 +0000 (10:26 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 30 May 2014 00:26:01 +0000 (10:26 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 30 May 2014 00:25:55 +0000 (10:25 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 30 May 2014 00:25:02 +0000 (10:25 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 30 May 2014 00:13:50 +0000 (10:13 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 30 May 2014 00:12:52 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 30 May 2014 00:11:54 +0000 (10:11 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 30 May 2014 00:10:56 +0000 (10:10 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Fri, 30 May 2014 00:10:00 +0000 (10:10 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 30 May 2014 00:09:05 +0000 (10:09 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 30 May 2014 00:01:37 +0000 (10:01 +1000)]
Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 30 May 2014 00:00:15 +0000 (10:00 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 29 May 2014 23:57:25 +0000 (09:57 +1000)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/include/asm/sections.h

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 29 May 2014 23:55:36 +0000 (09:55 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:54:40 +0000 (09:54 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:53:48 +0000 (09:53 +1000)]
Merge remote-tracking branch 'm68k/for-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Thu, 29 May 2014 23:52:33 +0000 (09:52 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:52:25 +0000 (09:52 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:51:25 +0000 (09:51 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 29 May 2014 23:50:30 +0000 (09:50 +1000)]
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/Makefile

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:49:14 +0000 (09:49 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:48:08 +0000 (09:48 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 29 May 2014 23:48:00 +0000 (09:48 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:47:57 +0000 (09:47 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 29 May 2014 23:44:00 +0000 (09:44 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos/exynos.c
arch/arm/mach-mvebu/board-v7.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-rockchip/rockchip.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/common.c