]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 12 Nov 2012 03:47:12 +0000 (14:47 +1100)]
Merge remote-tracking branch 'drop-experimental/linux-next'
Conflicts:
drivers/net/ethernet/intel/Kconfig
drivers/ptp/Kconfig
Stephen Rothwell [Mon, 12 Nov 2012 03:45:20 +0000 (14:45 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 12 Nov 2012 03:43:40 +0000 (14:43 +1100)]
Merge remote-tracking branch 'random/dev'
Stephen Rothwell [Mon, 12 Nov 2012 03:42:02 +0000 (14:42 +1100)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:35:05 +0000 (14:35 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/arm/kernel/process.c
arch/sparc/kernel/sys_sparc_64.c
Stephen Rothwell [Mon, 12 Nov 2012 03:33:10 +0000 (14:33 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:31:32 +0000 (14:31 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:29:51 +0000 (14:29 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Mon, 12 Nov 2012 03:28:10 +0000 (14:28 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:26:32 +0000 (14:26 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:24:46 +0000 (14:24 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 12 Nov 2012 03:23:02 +0000 (14:23 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Mon, 12 Nov 2012 03:22:59 +0000 (14:22 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:21:22 +0000 (14:21 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:19:39 +0000 (14:19 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:17:56 +0000 (14:17 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/pinctrl/pinctrl-nomadik.c
Stephen Rothwell [Mon, 12 Nov 2012 03:16:10 +0000 (14:16 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 03:15:54 +0000 (14:15 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Mon, 12 Nov 2012 03:13:57 +0000 (14:13 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
arch/arm/boot/dts/spear1340.dtsi
Stephen Rothwell [Mon, 12 Nov 2012 02:57:26 +0000 (13:57 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:55:32 +0000 (13:55 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/telephony/Kconfig
Stephen Rothwell [Mon, 12 Nov 2012 02:41:53 +0000 (13:41 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/early/ehci-dbgp.c
Stephen Rothwell [Mon, 12 Nov 2012 02:39:28 +0000 (13:39 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Mon, 12 Nov 2012 02:37:47 +0000 (13:37 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:36:06 +0000 (13:36 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:34:16 +0000 (13:34 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:32:21 +0000 (13:32 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:30:41 +0000 (13:30 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:29:04 +0000 (13:29 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:22:38 +0000 (13:22 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:22:27 +0000 (13:22 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
Stephen Rothwell [Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:12:08 +0000 (13:12 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 12 Nov 2012 02:04:36 +0000 (13:04 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 12 Nov 2012 02:02:58 +0000 (13:02 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Mon, 12 Nov 2012 02:01:14 +0000 (13:01 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:59:28 +0000 (12:59 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:57:40 +0000 (12:57 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 12 Nov 2012 01:56:00 +0000 (12:56 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Mon, 12 Nov 2012 01:48:20 +0000 (12:48 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/x86/pci/acpi.c
Stephen Rothwell [Mon, 12 Nov 2012 01:46:28 +0000 (12:46 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:44:46 +0000 (12:44 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:39:31 +0000 (12:39 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 12 Nov 2012 01:37:46 +0000 (12:37 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 12 Nov 2012 01:37:39 +0000 (12:37 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 12 Nov 2012 01:30:42 +0000 (12:30 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
Stephen Rothwell [Mon, 12 Nov 2012 01:28:56 +0000 (12:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:27:08 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:25:23 +0000 (12:25 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:18:06 +0000 (12:18 +1100)]
Merge remote-tracking branch 'slab/for-next'
Conflicts:
mm/slob.c
Stephen Rothwell [Mon, 12 Nov 2012 01:17:55 +0000 (12:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:16:13 +0000 (12:16 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:14:26 +0000 (12:14 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Mon, 12 Nov 2012 01:09:20 +0000 (12:09 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:05:02 +0000 (12:05 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:03:07 +0000 (12:03 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 12 Nov 2012 01:01:29 +0000 (12:01 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:54:42 +0000 (11:54 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:52:57 +0000 (11:52 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:51:01 +0000 (11:51 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:49:12 +0000 (11:49 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:47:32 +0000 (11:47 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:45:52 +0000 (11:45 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:44:17 +0000 (11:44 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:42:39 +0000 (11:42 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:40:26 +0000 (11:40 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:33:06 +0000 (11:33 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:29:04 +0000 (11:29 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:27:15 +0000 (11:27 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:22:05 +0000 (11:22 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:20:30 +0000 (11:20 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:18:50 +0000 (11:18 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:17:07 +0000 (11:17 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:17:00 +0000 (11:17 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Mon, 12 Nov 2012 00:10:30 +0000 (11:10 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:10:18 +0000 (11:10 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:08:13 +0000 (11:08 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Mon, 12 Nov 2012 00:00:42 +0000 (11:00 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:59:11 +0000 (10:59 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:59:10 +0000 (10:59 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:57:44 +0000 (10:57 +1100)]
Merge branch 'i2c/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:56:06 +0000 (10:56 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:52:40 +0000 (10:52 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:51:09 +0000 (10:51 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:49:29 +0000 (10:49 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:47:50 +0000 (10:47 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:47:42 +0000 (10:47 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:45:52 +0000 (10:45 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:44:12 +0000 (10:44 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:42:37 +0000 (10:42 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:40:57 +0000 (10:40 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:39:24 +0000 (10:39 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:32:52 +0000 (10:32 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:31:16 +0000 (10:31 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Sun, 11 Nov 2012 23:29:43 +0000 (10:29 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:28:09 +0000 (10:28 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:26:32 +0000 (10:26 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:25:03 +0000 (10:25 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Sun, 11 Nov 2012 23:23:30 +0000 (10:23 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Sun, 11 Nov 2012 23:21:57 +0000 (10:21 +1100)]
Merge remote-tracking branch 's390/features'
projects / karo-tx-linux.git / log