]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 21 Mar 2013 05:07:05 +0000 (16:07 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/mips/kernel/linux32.c
arch/tile/Kconfig
arch/tile/kernel/compat.c
include/asm-generic/unistd.h
Stephen Rothwell [Thu, 21 Mar 2013 05:05:32 +0000 (16:05 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 05:03:58 +0000 (16:03 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 05:02:22 +0000 (16:02 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
drivers/clocksource/tegra20_timer.c
Stephen Rothwell [Thu, 21 Mar 2013 05:00:47 +0000 (16:00 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:59:12 +0000 (15:59 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 21 Mar 2013 04:57:42 +0000 (15:57 +1100)]
Merge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:56:07 +0000 (15:56 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:54:32 +0000 (15:54 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
Stephen Rothwell [Thu, 21 Mar 2013 04:45:43 +0000 (15:45 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/boot/dts/snowball.dts
Stephen Rothwell [Thu, 21 Mar 2013 04:41:28 +0000 (15:41 +1100)]
Merge remote-tracking branch 'gen-gpio/for_next'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Thu, 21 Mar 2013 04:38:02 +0000 (15:38 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Thu, 21 Mar 2013 04:36:31 +0000 (15:36 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Thu, 21 Mar 2013 04:34:52 +0000 (15:34 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/Makefile
Stephen Rothwell [Thu, 21 Mar 2013 04:33:09 +0000 (15:33 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:30:55 +0000 (15:30 +1100)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Thu, 21 Mar 2013 04:29:18 +0000 (15:29 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 21 Mar 2013 04:25:40 +0000 (15:25 +1100)]
Merge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 21 Mar 2013 04:23:40 +0000 (15:23 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/host/ehci-timer.c
Stephen Rothwell [Thu, 21 Mar 2013 04:13:36 +0000 (15:13 +1100)]
Stephen Rothwell [Thu, 21 Mar 2013 03:57:30 +0000 (14:57 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:55:41 +0000 (14:55 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:54:05 +0000 (14:54 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:53:52 +0000 (14:53 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Conflicts:
drivers/platform/x86/chromeos_laptop.c
Stephen Rothwell [Thu, 21 Mar 2013 03:46:23 +0000 (14:46 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:39:56 +0000 (14:39 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:38:11 +0000 (14:38 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 21 Mar 2013 03:23:07 +0000 (14:23 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Conflicts:
kernel/trace/ftrace.c
Stephen Rothwell [Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 21 Mar 2013 03:14:36 +0000 (14:14 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:12:58 +0000 (14:12 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 03:11:14 +0000 (14:11 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/virtual/virtio-spec.txt
Stephen Rothwell [Thu, 21 Mar 2013 03:04:08 +0000 (14:04 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 21 Mar 2013 03:02:38 +0000 (14:02 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 21 Mar 2013 03:01:02 +0000 (14:01 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 21 Mar 2013 03:00:55 +0000 (14:00 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 21 Mar 2013 02:59:26 +0000 (13:59 +1100)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 21 Mar 2013 02:57:54 +0000 (13:57 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:56:16 +0000 (13:56 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 21 Mar 2013 02:54:46 +0000 (13:54 +1100)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Thu, 21 Mar 2013 02:53:14 +0000 (13:53 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:46:02 +0000 (13:46 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:45:58 +0000 (13:45 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:44:29 +0000 (13:44 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:42:46 +0000 (13:42 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Thu, 21 Mar 2013 02:42:43 +0000 (13:42 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:38:23 +0000 (13:38 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/linux/res_counter.h
Stephen Rothwell [Thu, 21 Mar 2013 02:31:27 +0000 (13:31 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 21 Mar 2013 02:26:03 +0000 (13:26 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:18:34 +0000 (13:18 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 21 Mar 2013 02:13:00 +0000 (13:13 +1100)]
Stephen Rothwell [Thu, 21 Mar 2013 01:42:53 +0000 (12:42 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 01:35:33 +0000 (12:35 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Thu, 21 Mar 2013 01:34:02 +0000 (12:34 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:32:30 +0000 (12:32 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:30:57 +0000 (12:30 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:26:29 +0000 (12:26 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:22:42 +0000 (12:22 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:18:38 +0000 (12:18 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:18:32 +0000 (12:18 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Thu, 21 Mar 2013 01:17:01 +0000 (12:17 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 21 Mar 2013 01:15:23 +0000 (12:15 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 01:13:40 +0000 (12:13 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 21 Mar 2013 01:12:03 +0000 (12:12 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 21 Mar 2013 01:10:15 +0000 (12:10 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 01:08:47 +0000 (12:08 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 21 Mar 2013 01:07:07 +0000 (12:07 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 21 Mar 2013 01:06:57 +0000 (12:06 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 01:05:10 +0000 (12:05 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/media/platform/Kconfig
Stephen Rothwell [Thu, 21 Mar 2013 00:31:55 +0000 (11:31 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:30:32 +0000 (11:30 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 21 Mar 2013 00:29:08 +0000 (11:29 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:27:38 +0000 (11:27 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:26:07 +0000 (11:26 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:24:44 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:22:50 +0000 (11:22 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:21:24 +0000 (11:21 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:19:45 +0000 (11:19 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 21 Mar 2013 00:18:20 +0000 (11:18 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:16:57 +0000 (11:16 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 21 Mar 2013 00:15:33 +0000 (11:15 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 21 Mar 2013 00:14:05 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 21 Mar 2013 00:12:39 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 00:12:38 +0000 (11:12 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 21 Mar 2013 00:11:11 +0000 (11:11 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 21 Mar 2013 00:09:48 +0000 (11:09 +1100)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Thu, 21 Mar 2013 00:08:26 +0000 (11:08 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 21 Mar 2013 00:07:04 +0000 (11:07 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 21 Mar 2013 00:04:34 +0000 (11:04 +1100)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Thu, 21 Mar 2013 00:03:12 +0000 (11:03 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 20 Mar 2013 23:56:19 +0000 (10:56 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 20 Mar 2013 23:54:55 +0000 (10:54 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 20 Mar 2013 23:53:33 +0000 (10:53 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 20 Mar 2013 23:52:08 +0000 (10:52 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 20 Mar 2013 23:52:01 +0000 (10:52 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-zynq/common.c
Stephen Rothwell [Wed, 20 Mar 2013 23:50:35 +0000 (10:50 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 20 Mar 2013 23:49:12 +0000 (10:49 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 20 Mar 2013 23:46:55 +0000 (10:46 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'
projects / karo-tx-linux.git / log