]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 19 Jun 2013 05:33:56 +0000 (15:33 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/silicom/bpctl_mod.c
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
Stephen Rothwell [Wed, 19 Jun 2013 05:31:44 +0000 (15:31 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 19 Jun 2013 05:29:40 +0000 (15:29 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 19 Jun 2013 05:26:01 +0000 (15:26 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/base/cpu.c
drivers/base/firmware_class.c
drivers/base/memory.c
include/linux/platform_device.h
Stephen Rothwell [Wed, 19 Jun 2013 05:11:16 +0000 (15:11 +1000)]
Stephen Rothwell [Wed, 19 Jun 2013 05:04:22 +0000 (15:04 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:56:00 +0000 (14:56 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:51:28 +0000 (14:51 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:49:51 +0000 (14:49 +1000)]
Merge remote-tracking branch 'xen-arm/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:42:50 +0000 (14:42 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:41:07 +0000 (14:41 +1000)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:39:28 +0000 (14:39 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/pgtable.h
Stephen Rothwell [Wed, 19 Jun 2013 04:31:09 +0000 (14:31 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:29:11 +0000 (14:29 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:26:24 +0000 (14:26 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:24:47 +0000 (14:24 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:16:25 +0000 (14:16 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Stephen Rothwell [Wed, 19 Jun 2013 04:14:36 +0000 (14:14 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:14:30 +0000 (14:14 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:08:26 +0000 (14:08 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:08:23 +0000 (14:08 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:06:44 +0000 (14:06 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Conflicts:
drivers/video/of_display_timing.c
Stephen Rothwell [Wed, 19 Jun 2013 04:05:06 +0000 (14:05 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:03:28 +0000 (14:03 +1000)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:01:51 +0000 (14:01 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:53:57 +0000 (13:53 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:53:54 +0000 (13:53 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:52:15 +0000 (13:52 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:52:01 +0000 (13:52 +1000)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 19 Jun 2013 03:47:28 +0000 (13:47 +1000)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
include/linux/cgroup.h
Stephen Rothwell [Wed, 19 Jun 2013 03:17:04 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:15:28 +0000 (13:15 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:13:50 +0000 (13:13 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 19 Jun 2013 03:12:11 +0000 (13:12 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:10:35 +0000 (13:10 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:08:56 +0000 (13:08 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:07:04 +0000 (13:07 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:05:28 +0000 (13:05 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:03:48 +0000 (13:03 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Wed, 19 Jun 2013 02:55:48 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Wed, 19 Jun 2013 02:54:11 +0000 (12:54 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:52:34 +0000 (12:52 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:50:54 +0000 (12:50 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/mgmt.c
Stephen Rothwell [Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:44:33 +0000 (12:44 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:36:46 +0000 (12:36 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/xen-netback/netback.c
net/batman-adv/bat_iv_ogm.c
Stephen Rothwell [Wed, 19 Jun 2013 02:35:08 +0000 (12:35 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:33:23 +0000 (12:33 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:31:17 +0000 (12:31 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:29:40 +0000 (12:29 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:28:03 +0000 (12:28 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:26:27 +0000 (12:26 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:24:49 +0000 (12:24 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:24:44 +0000 (12:24 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c
Stephen Rothwell [Wed, 19 Jun 2013 02:23:04 +0000 (12:23 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:14:52 +0000 (12:14 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:11:27 +0000 (12:11 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:09:26 +0000 (12:09 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:07:52 +0000 (12:07 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:06:15 +0000 (12:06 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:04:38 +0000 (12:04 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:00:48 +0000 (12:00 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h
Stephen Rothwell [Wed, 19 Jun 2013 01:59:05 +0000 (11:59 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:57:27 +0000 (11:57 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:55:18 +0000 (11:55 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:53:41 +0000 (11:53 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:49:23 +0000 (11:49 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:47:25 +0000 (11:47 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 19 Jun 2013 01:45:49 +0000 (11:45 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:44:15 +0000 (11:44 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 19 Jun 2013 01:36:08 +0000 (11:36 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 19 Jun 2013 01:34:34 +0000 (11:34 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 19 Jun 2013 01:26:50 +0000 (11:26 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 19 Jun 2013 01:25:16 +0000 (11:25 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 19 Jun 2013 01:23:39 +0000 (11:23 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:22:04 +0000 (11:22 +1000)]
Merge remote-tracking branch 'ceph/master'
Conflicts:
drivers/block/rbd.c
Stephen Rothwell [Wed, 19 Jun 2013 01:02:07 +0000 (11:02 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 19 Jun 2013 01:00:29 +0000 (11:00 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Wed, 19 Jun 2013 00:56:49 +0000 (10:56 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 19 Jun 2013 00:55:15 +0000 (10:55 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 19 Jun 2013 00:53:38 +0000 (10:53 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 00:52:04 +0000 (10:52 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 00:50:31 +0000 (10:50 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Conflicts:
arch/cris/arch-v32/drivers/Kconfig
Stephen Rothwell [Wed, 19 Jun 2013 00:48:58 +0000 (10:48 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 19 Jun 2013 00:47:23 +0000 (10:47 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 00:45:44 +0000 (10:45 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Conflicts:
include/uapi/linux/kvm.h
Stephen Rothwell [Wed, 19 Jun 2013 00:45:41 +0000 (10:45 +1000)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c
Stephen Rothwell [Wed, 19 Jun 2013 00:44:02 +0000 (10:44 +1000)]
Merge remote-tracking branch 'arm-mpidr/for-next'
Conflicts:
arch/arm/kernel/suspend.c
Stephen Rothwell [Wed, 19 Jun 2013 00:33:14 +0000 (10:33 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 00:31:42 +0000 (10:31 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:54 +0000 (10:29 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:53 +0000 (10:29 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:48 +0000 (10:29 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:46 +0000 (10:29 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:46 +0000 (10:29 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:45 +0000 (10:29 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:43 +0000 (10:29 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 19 Jun 2013 00:29:42 +0000 (10:29 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
projects / karo-tx-linux.git / log