]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 6 Jan 2014 07:59:06 +0000 (18:59 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:48:39 +0000 (18:48 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:38:20 +0000 (18:38 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:37:16 +0000 (18:37 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:35:58 +0000 (18:35 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:35:07 +0000 (18:35 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:26:46 +0000 (18:26 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:25:48 +0000 (18:25 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:24:59 +0000 (18:24 +1100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:22:00 +0000 (18:22 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:20:59 +0000 (18:20 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:20:04 +0000 (18:20 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Conflicts:
drivers/clocksource/clksrc-of.c
Stephen Rothwell [Mon, 6 Jan 2014 07:09:38 +0000 (18:09 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/acpi/acpi_extlog.c
Stephen Rothwell [Mon, 6 Jan 2014 07:02:18 +0000 (18:02 +1100)]
next-
20131224/spi
Conflicts:
drivers/spi/spi-mpc512x-psc.c
Stephen Rothwell [Mon, 6 Jan 2014 06:54:12 +0000 (17:54 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:54:05 +0000 (17:54 +1100)]
Merge remote-tracking branch 'audit/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:45:49 +0000 (17:45 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/gpu/drm/qxl/Kconfig
Stephen Rothwell [Mon, 6 Jan 2014 06:40:25 +0000 (17:40 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:40:18 +0000 (17:40 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:39:14 +0000 (17:39 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:38:08 +0000 (17:38 +1100)]
Merge remote-tracking branch 'selinux/master'
Conflicts:
security/selinux/hooks.c
Stephen Rothwell [Mon, 6 Jan 2014 06:37:02 +0000 (17:37 +1100)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:35:47 +0000 (17:35 +1100)]
Revert "regulator: act8865: register all regulators regardless of how many are used"
This reverts commit
d04b755273683ed31043563b8a3a2716bd8aa6a9.
Stephen Rothwell [Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:27:34 +0000 (17:27 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:26:19 +0000 (17:26 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:59 +0000 (17:24 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:56 +0000 (17:24 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Conflicts:
kernel/debug/debug_core.h
Stephen Rothwell [Mon, 6 Jan 2014 06:07:56 +0000 (17:07 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Conflicts:
drivers/md/dm-thin.c
Stephen Rothwell [Mon, 6 Jan 2014 05:58:58 +0000 (16:58 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h
Stephen Rothwell [Mon, 6 Jan 2014 05:27:34 +0000 (16:27 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 6 Jan 2014 05:25:30 +0000 (16:25 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:17:43 +0000 (16:17 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Documentation/module-signing.txt
Stephen Rothwell [Mon, 6 Jan 2014 05:16:20 +0000 (16:16 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Stephen Rothwell [Mon, 6 Jan 2014 05:15:02 +0000 (16:15 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:13:45 +0000 (16:13 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_pm.c
Stephen Rothwell [Mon, 6 Jan 2014 05:11:58 +0000 (16:11 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Mon, 6 Jan 2014 05:01:34 +0000 (16:01 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:59:45 +0000 (15:59 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 04:56:55 +0000 (15:56 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:55:10 +0000 (15:55 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:53:56 +0000 (15:53 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:44:01 +0000 (15:44 +1100)]
Revert "macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats"
This reverts commit
cdf3e274cf1b36e9a2fef2d175cabc566af841b2.
Stephen Rothwell [Mon, 6 Jan 2014 04:34:14 +0000 (15:34 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c
Stephen Rothwell [Mon, 6 Jan 2014 03:17:09 +0000 (14:17 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
Stephen Rothwell [Mon, 6 Jan 2014 03:16:16 +0000 (14:16 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 03:15:28 +0000 (14:15 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:14:16 +0000 (14:14 +1100)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/cpufreq/Kconfig
Stephen Rothwell [Mon, 6 Jan 2014 01:54:27 +0000 (12:54 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:44:21 +0000 (12:44 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:43:21 +0000 (12:43 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:42:29 +0000 (12:42 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:40:14 +0000 (12:40 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:39:26 +0000 (12:39 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:38:37 +0000 (12:38 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:37:36 +0000 (12:37 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:28:41 +0000 (12:28 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:27:19 +0000 (12:27 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:26:29 +0000 (12:26 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:25:18 +0000 (12:25 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:23:54 +0000 (12:23 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:22:33 +0000 (12:22 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:21:44 +0000 (12:21 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:54 +0000 (12:20 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:04 +0000 (12:20 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Mon, 6 Jan 2014 01:19:16 +0000 (12:19 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:18:15 +0000 (12:18 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:17:21 +0000 (12:17 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 6 Jan 2014 01:16:33 +0000 (12:16 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:15:40 +0000 (12:15 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:14:51 +0000 (12:14 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 6 Jan 2014 00:35:45 +0000 (11:35 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 6 Jan 2014 00:34:29 +0000 (11:34 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts
Stephen Rothwell [Mon, 6 Jan 2014 00:23:38 +0000 (11:23 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:08:10 +0000 (11:08 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:07:20 +0000 (11:07 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 6 Jan 2014 00:06:31 +0000 (11:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:05:43 +0000 (11:05 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:04:54 +0000 (11:04 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:04:06 +0000 (11:04 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:02:50 +0000 (11:02 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 00:01:48 +0000 (11:01 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 6 Jan 2014 00:00:56 +0000 (11:00 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:52:00 +0000 (10:52 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Sun, 5 Jan 2014 23:51:53 +0000 (10:51 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:51:46 +0000 (10:51 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:50:49 +0000 (10:50 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Sun, 5 Jan 2014 23:49:52 +0000 (10:49 +1100)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:47:17 +0000 (10:47 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
arch/arm/boot/dts/imx51-apf51.dts
arch/arm/boot/dts/imx6q-sabrelite.dts
Stephen Rothwell [Sun, 5 Jan 2014 23:25:54 +0000 (10:25 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:20:29 +0000 (10:20 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig.debug
Stephen Rothwell [Sun, 5 Jan 2014 23:08:55 +0000 (10:08 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:08:08 +0000 (10:08 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:20 +0000 (10:03 +1100)]
Merge remote-tracking branch 'mfd-fixes/master'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:15 +0000 (10:03 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 5 Jan 2014 23:03:13 +0000 (10:03 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
projects / karo-tx-linux.git / log