]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 20 May 2014 08:00:11 +0000 (18:00 +1000)]
Revert "mfd: stmpe: root out static GPIO and IRQ assignments"
This reverts commit
3ba1d516d5feddba3e13d30d31a70da130a3ee0e.
Stephen Rothwell [Tue, 20 May 2014 07:34:14 +0000 (17:34 +1000)]
Merge branch 'rd-docs/master'
Stephen Rothwell [Tue, 20 May 2014 07:32:43 +0000 (17:32 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Tue, 20 May 2014 07:31:26 +0000 (17:31 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Tue, 20 May 2014 07:29:54 +0000 (17:29 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Tue, 20 May 2014 07:28:37 +0000 (17:28 +1000)]
Merge remote-tracking branch 'random/dev'
Stephen Rothwell [Tue, 20 May 2014 07:27:22 +0000 (17:27 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Stephen Rothwell [Tue, 20 May 2014 07:26:26 +0000 (17:26 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Tue, 20 May 2014 07:16:53 +0000 (17:16 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Tue, 20 May 2014 06:49:47 +0000 (16:49 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:48:50 +0000 (16:48 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Tue, 20 May 2014 06:47:19 +0000 (16:47 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Conflicts:
Documentation/driver-model/devres.txt
Stephen Rothwell [Tue, 20 May 2014 06:46:01 +0000 (16:46 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:45:00 +0000 (16:45 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:44:57 +0000 (16:44 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:38:47 +0000 (16:38 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:37:47 +0000 (16:37 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 20 May 2014 06:27:48 +0000 (16:27 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Stephen Rothwell [Tue, 20 May 2014 06:26:46 +0000 (16:26 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Stephen Rothwell [Tue, 20 May 2014 06:22:04 +0000 (16:22 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 20 May 2014 06:20:20 +0000 (16:20 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/arm64/kernel/early_printk.c
Stephen Rothwell [Tue, 20 May 2014 06:08:01 +0000 (16:08 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 20 May 2014 06:06:54 +0000 (16:06 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:05:37 +0000 (16:05 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:04:14 +0000 (16:04 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 20 May 2014 06:04:06 +0000 (16:04 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 20 May 2014 05:52:57 +0000 (15:52 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:41:38 +0000 (15:41 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:32:41 +0000 (15:32 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Tue, 20 May 2014 05:31:31 +0000 (15:31 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Tue, 20 May 2014 05:30:27 +0000 (15:30 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 20 May 2014 05:19:13 +0000 (15:19 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 20 May 2014 05:16:38 +0000 (15:16 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:15:41 +0000 (15:15 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:14:38 +0000 (15:14 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:03:13 +0000 (15:03 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c
Stephen Rothwell [Tue, 20 May 2014 05:01:59 +0000 (15:01 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Tue, 20 May 2014 05:00:08 +0000 (15:00 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:58:21 +0000 (14:58 +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
Stephen Rothwell [Tue, 20 May 2014 04:56:34 +0000 (14:56 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Stephen Rothwell [Tue, 20 May 2014 04:55:14 +0000 (14:55 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 20 May 2014 04:54:22 +0000 (14:54 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 20 May 2014 04:53:10 +0000 (14:53 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 20 May 2014 04:43:12 +0000 (14:43 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 20 May 2014 04:41:55 +0000 (14:41 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:39:59 +0000 (14:39 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:38:07 +0000 (14:38 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c
Stephen Rothwell [Tue, 20 May 2014 04:33:30 +0000 (14:33 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:33:13 +0000 (14:33 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 20 May 2014 04:32:16 +0000 (14:32 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Tue, 20 May 2014 04:31:00 +0000 (14:31 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 20 May 2014 04:29:34 +0000 (14:29 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:19:55 +0000 (14:19 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:18:50 +0000 (14:18 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 20 May 2014 04:17:45 +0000 (14:17 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 20 May 2014 04:06:38 +0000 (14:06 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 20 May 2014 04:05:23 +0000 (14:05 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:04:19 +0000 (14:04 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:03:22 +0000 (14:03 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 20 May 2014 04:02:00 +0000 (14:02 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 20 May 2014 04:01:03 +0000 (14:01 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 20 May 2014 03:59:27 +0000 (13:59 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
Stephen Rothwell [Tue, 20 May 2014 03:58:25 +0000 (13:58 +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
Stephen Rothwell [Tue, 20 May 2014 03:43:37 +0000 (13:43 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 20 May 2014 03:42:17 +0000 (13:42 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
drivers/bluetooth/btusb.c
Stephen Rothwell [Tue, 20 May 2014 03:40:50 +0000 (13:40 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Tue, 20 May 2014 03:39:22 +0000 (13:39 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 20 May 2014 03:37:17 +0000 (13:37 +1000)]
next-
20140516/net-next
Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c
Stephen Rothwell [Tue, 20 May 2014 03:18:08 +0000 (13:18 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 20 May 2014 03:16:57 +0000 (13:16 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 20 May 2014 03:16:01 +0000 (13:16 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 20 May 2014 03:15:04 +0000 (13:15 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 20 May 2014 03:04:05 +0000 (13:04 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/mips/loongson/lemote-2f/clock.c
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h
Stephen Rothwell [Tue, 20 May 2014 03:02:56 +0000 (13:02 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 20 May 2014 03:01:34 +0000 (13:01 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:59:48 +0000 (12:59 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 20 May 2014 02:58:55 +0000 (12:58 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 20 May 2014 02:57:57 +0000 (12:57 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:56:02 +0000 (12:56 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 20 May 2014 02:41:46 +0000 (12:41 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c
Stephen Rothwell [Tue, 20 May 2014 02:40:26 +0000 (12:40 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:30:28 +0000 (12:30 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:29:36 +0000 (12:29 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:28:22 +0000 (12:28 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 20 May 2014 02:27:19 +0000 (12:27 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 20 May 2014 02:25:40 +0000 (12:25 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 20 May 2014 02:24:47 +0000 (12:24 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 20 May 2014 02:23:51 +0000 (12:23 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 20 May 2014 02:23:45 +0000 (12:23 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 20 May 2014 02:22:52 +0000 (12:22 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 20 May 2014 02:11:48 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 20 May 2014 02:10:51 +0000 (12:10 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 20 May 2014 02:09:53 +0000 (12:09 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 20 May 2014 02:08:51 +0000 (12:08 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Tue, 20 May 2014 02:07:55 +0000 (12:07 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 20 May 2014 02:00:28 +0000 (12:00 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Conflicts:
arch/sparc/include/asm/pgtable_64.h
Stephen Rothwell [Tue, 20 May 2014 01:52:34 +0000 (11:52 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 20 May 2014 01:51:41 +0000 (11:51 +1000)]
Merge remote-tracking branch 'fsl/next'
Stephen Rothwell [Tue, 20 May 2014 01:48:55 +0000 (11:48 +1000)]
Merge remote-tracking branch 'powerpc/next'
Conflicts:
arch/powerpc/kernel/exceptions-64s.S
projects / karo-tx-linux.git / log