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