]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 16 Jan 2014 05:24:27 +0000 (16:24 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:23:17 +0000 (16:23 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:21:35 +0000 (16:21 +1100)]
Merge remote-tracking branch 'gpio/for-next'
Conflicts:
arch/xtensa/Kconfig
drivers/leds/leds-s3c24xx.c
Stephen Rothwell [Thu, 16 Jan 2014 05:20:21 +0000 (16:20 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:19:05 +0000 (16:19 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:17:11 +0000 (16:17 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Conflicts:
drivers/target/target_core_tpg.c
Stephen Rothwell [Thu, 16 Jan 2014 05:15:18 +0000 (16:15 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:14:02 +0000 (16:14 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 16 Jan 2014 05:12:04 +0000 (16:12 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Thu, 16 Jan 2014 05:04:38 +0000 (16:04 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:54:08 +0000 (15:54 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:43:47 +0000 (15:43 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:42:43 +0000 (15:42 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:41:23 +0000 (15:41 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:40:32 +0000 (15:40 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:39:15 +0000 (15:39 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
kernel/workqueue.c
Stephen Rothwell [Thu, 16 Jan 2014 04:38:01 +0000 (15:38 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:29:12 +0000 (15:29 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Conflicts:
arch/arm/include/asm/xen/page.h
Stephen Rothwell [Thu, 16 Jan 2014 04:28:13 +0000 (15:28 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:27:24 +0000 (15:27 +1100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Thu, 16 Jan 2014 04:20:22 +0000 (15:20 +1100)]
Stephen Rothwell [Thu, 16 Jan 2014 04:02:19 +0000 (15:02 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 16 Jan 2014 04:00:34 +0000 (15:00 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 03:59:34 +0000 (14:59 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 03:58:40 +0000 (14:58 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Thu, 16 Jan 2014 03:56:05 +0000 (14:56 +1100)]
Revert "x86 idle: restore mwait_idle()"
This reverts commit
7760518cce95c00ba1cbcbc81c8c1af7fd3425f4.
Stephen Rothwell [Thu, 16 Jan 2014 03:19:02 +0000 (14:19 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/mips/Kconfig
arch/mips/netlogic/xlp/setup.c
arch/xtensa/include/asm/barrier.h
drivers/acpi/acpi_extlog.c
drivers/acpi/apei/einj.c
drivers/acpi/processor_idle.c
Stephen Rothwell [Thu, 16 Jan 2014 03:17:00 +0000 (14:17 +1100)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi-mpc512x-psc.c
Stephen Rothwell [Thu, 16 Jan 2014 03:16:00 +0000 (14:16 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 03:14:20 +0000 (14:14 +1100)]
Merge remote-tracking branch 'audit/master'
Conflicts:
include/net/xfrm.h
Stephen Rothwell [Thu, 16 Jan 2014 03:05:59 +0000 (14:05 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/gpu/drm/qxl/Kconfig
Stephen Rothwell [Thu, 16 Jan 2014 03:05:05 +0000 (14:05 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:59:45 +0000 (13:59 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 16 Jan 2014 02:58:26 +0000 (13:58 +1100)]
Merge remote-tracking branch 'iommu/next'
Conflicts:
drivers/gpu/drm/msm/Kconfig
Stephen Rothwell [Thu, 16 Jan 2014 02:57:21 +0000 (13:57 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
drivers/char/tpm/tpm_ppi.c
Stephen Rothwell [Thu, 16 Jan 2014 02:55:03 +0000 (13:55 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:53:48 +0000 (13:53 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:52:27 +0000 (13:52 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 16 Jan 2014 02:51:11 +0000 (13:51 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:50:12 +0000 (13:50 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:48:54 +0000 (13:48 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:48:51 +0000 (13:48 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Conflicts:
kernel/debug/debug_core.h
Stephen Rothwell [Thu, 16 Jan 2014 02:47:37 +0000 (13:47 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
MAINTAINERS
Stephen Rothwell [Thu, 16 Jan 2014 02:46:14 +0000 (13:46 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Conflicts:
drivers/md/dm-thin.c
Stephen Rothwell [Thu, 16 Jan 2014 02:37:14 +0000 (13:37 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
drivers/md/raid1.c
drivers/md/raid10.c
fs/btrfs/extent_io.c
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h
Stephen Rothwell [Thu, 16 Jan 2014 02:31:34 +0000 (13:31 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:30:15 +0000 (13:30 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 16 Jan 2014 02:29:26 +0000 (13:29 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:21:39 +0000 (13:21 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Documentation/module-signing.txt
Stephen Rothwell [Thu, 16 Jan 2014 02:16:12 +0000 (13:16 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Stephen Rothwell [Thu, 16 Jan 2014 02:13:52 +0000 (13:13 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Stephen Rothwell [Thu, 16 Jan 2014 02:12:26 +0000 (13:12 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 02:10:46 +0000 (13:10 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_pm.c
Stephen Rothwell [Thu, 16 Jan 2014 02:08:56 +0000 (13:08 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Thu, 16 Jan 2014 01:57:31 +0000 (12:57 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:56:36 +0000 (12:56 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:55:28 +0000 (12:55 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Conflicts:
include/linux/mlx4/device.h
Stephen Rothwell [Thu, 16 Jan 2014 01:54:15 +0000 (12:54 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:52:26 +0000 (12:52 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 16 Jan 2014 01:41:50 +0000 (12:41 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/mips/bcm47xx/setup.c
arch/um/include/asm/Kbuild
Stephen Rothwell [Thu, 16 Jan 2014 01:07:04 +0000 (12:07 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:05:58 +0000 (12:05 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 01:05:09 +0000 (12:05 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 16 Jan 2014 01:04:21 +0000 (12:04 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 01:03:12 +0000 (12:03 +1100)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/cpufreq/Kconfig
Stephen Rothwell [Thu, 16 Jan 2014 01:02:05 +0000 (12:02 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:49:36 +0000 (11:49 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:48:13 +0000 (11:48 +1100)]
Merge remote-tracking branch 'libata/for-next'
Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
drivers/ata/ahci.c
Stephen Rothwell [Thu, 16 Jan 2014 00:40:44 +0000 (11:40 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:39:54 +0000 (11:39 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:38:09 +0000 (11:38 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/go7007/go7007-usb.c
Stephen Rothwell [Thu, 16 Jan 2014 00:37:19 +0000 (11:37 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:36:30 +0000 (11:36 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:35:32 +0000 (11:35 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:34:30 +0000 (11:34 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:25:36 +0000 (11:25 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:24:13 +0000 (11:24 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:23:23 +0000 (11:23 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:22:11 +0000 (11:22 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:20:47 +0000 (11:20 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:19:28 +0000 (11:19 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:18:39 +0000 (11:18 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:17:47 +0000 (11:17 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:16:57 +0000 (11:16 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Thu, 16 Jan 2014 00:16:07 +0000 (11:16 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 16 Jan 2014 00:15:07 +0000 (11:15 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 16 Jan 2014 00:14:12 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 16 Jan 2014 00:13:24 +0000 (11:13 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:12:33 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 16 Jan 2014 00:11:44 +0000 (11:11 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 16 Jan 2014 00:10:24 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 16 Jan 2014 00:09:36 +0000 (11:09 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 16 Jan 2014 00:08:45 +0000 (11:08 +1100)]
Merge remote-tracking branch 'uml/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:54:43 +0000 (10:54 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 15 Jan 2014 23:53:28 +0000 (10:53 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:44:47 +0000 (10:44 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 15 Jan 2014 23:43:56 +0000 (10:43 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 15 Jan 2014 23:42:50 +0000 (10:42 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 15 Jan 2014 23:42:01 +0000 (10:42 +1100)]
Merge remote-tracking branch 'microblaze/next'
projects / karo-tx-linux.git / log