]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 14 Nov 2012 04:21:39 +0000 (15:21 +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 [Wed, 14 Nov 2012 04:15:45 +0000 (15:15 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 04:15:29 +0000 (15:15 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 14 Nov 2012 04:13:28 +0000 (15:13 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
arch/arm/boot/dts/spear1340.dtsi
Stephen Rothwell [Wed, 14 Nov 2012 04:11:35 +0000 (15:11 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 14 Nov 2012 04:09:35 +0000 (15:09 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
Stephen Rothwell [Wed, 14 Nov 2012 04:07:28 +0000 (15:07 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Stephen Rothwell [Wed, 14 Nov 2012 03:59:42 +0000 (14:59 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Wed, 14 Nov 2012 03:58:02 +0000 (14:58 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:56:21 +0000 (14:56 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:54:30 +0000 (14:54 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:52:36 +0000 (14:52 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:50:56 +0000 (14:50 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:49:15 +0000 (14:49 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:42:49 +0000 (14:42 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:42:38 +0000 (14:42 +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 [Wed, 14 Nov 2012 03:39:52 +0000 (14:39 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:32:24 +0000 (14:32 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 14 Nov 2012 03:24:59 +0000 (14:24 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:17:28 +0000 (14:17 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 14 Nov 2012 03:15:46 +0000 (14:15 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:14:04 +0000 (14:14 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:12:23 +0000 (14:12 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 03:10:35 +0000 (14:10 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 14 Nov 2012 03:08:54 +0000 (14:08 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 14 Nov 2012 03:01:15 +0000 (14:01 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/x86/pci/acpi.c
Stephen Rothwell [Wed, 14 Nov 2012 02:59:22 +0000 (13:59 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:57:39 +0000 (13:57 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:52:28 +0000 (13:52 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 14 Nov 2012 02:50:40 +0000 (13:50 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 14 Nov 2012 02:50:34 +0000 (13:50 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 14 Nov 2012 02:43:39 +0000 (13:43 +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 [Wed, 14 Nov 2012 02:41:48 +0000 (13:41 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:40:01 +0000 (13:40 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:38:17 +0000 (13:38 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:30:56 +0000 (13:30 +1100)]
Merge remote-tracking branch 'slab/for-next'
Conflicts:
mm/slob.c
Stephen Rothwell [Wed, 14 Nov 2012 02:30:46 +0000 (13:30 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:29:07 +0000 (13:29 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:27:18 +0000 (13:27 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 14 Nov 2012 02:22:12 +0000 (13:22 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:17:53 +0000 (13:17 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:15:53 +0000 (13:15 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 14 Nov 2012 02:14:10 +0000 (13:14 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:07:20 +0000 (13:07 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:05:32 +0000 (13:05 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:03:35 +0000 (13:03 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:01:49 +0000 (13:01 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 14 Nov 2012 02:00:12 +0000 (13:00 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:58:26 +0000 (12:58 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:56:48 +0000 (12:56 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:55:06 +0000 (12:55 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:53:00 +0000 (12:53 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:45:37 +0000 (12:45 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 14 Nov 2012 01:41:38 +0000 (12:41 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 14 Nov 2012 01:39:49 +0000 (12:39 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 01:34:38 +0000 (12:34 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 01:33:01 +0000 (12:33 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 14 Nov 2012 01:31:23 +0000 (12:31 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 01:29:41 +0000 (12:29 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 14 Nov 2012 01:29:34 +0000 (12:29 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 14 Nov 2012 01:23:03 +0000 (12:23 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Wed, 14 Nov 2012 01:22:51 +0000 (12:22 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 01:20:22 +0000 (12:20 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Wed, 14 Nov 2012 00:44:21 +0000 (11:44 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:42:50 +0000 (11:42 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Wed, 14 Nov 2012 00:42:49 +0000 (11:42 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:41:19 +0000 (11:41 +1100)]
Merge branch 'i2c/master'
Stephen Rothwell [Wed, 14 Nov 2012 00:39:36 +0000 (11:39 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 14 Nov 2012 00:34:40 +0000 (11:34 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:33:01 +0000 (11:33 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:31:27 +0000 (11:31 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:31:20 +0000 (11:31 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:29:24 +0000 (11:29 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:27:40 +0000 (11:27 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:26:02 +0000 (11:26 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:24:22 +0000 (11:24 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 14 Nov 2012 00:22:51 +0000 (11:22 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 14 Nov 2012 00:16:18 +0000 (11:16 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:14:42 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 14 Nov 2012 00:13:11 +0000 (11:13 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 14 Nov 2012 00:11:35 +0000 (11:11 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:09:57 +0000 (11:09 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 14 Nov 2012 00:08:27 +0000 (11:08 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 14 Nov 2012 00:06:55 +0000 (11:06 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 14 Nov 2012 00:05:25 +0000 (11:05 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 14 Nov 2012 00:03:48 +0000 (11:03 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 14 Nov 2012 00:03:46 +0000 (11:03 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 14 Nov 2012 00:02:15 +0000 (11:02 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 14 Nov 2012 00:00:45 +0000 (11:00 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 13 Nov 2012 23:59:13 +0000 (10:59 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 13 Nov 2012 23:57:35 +0000 (10:57 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 13 Nov 2012 23:56:04 +0000 (10:56 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 13 Nov 2012 23:54:27 +0000 (10:54 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 13 Nov 2012 23:52:55 +0000 (10:52 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 13 Nov 2012 23:51:28 +0000 (10:51 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 13 Nov 2012 23:49:55 +0000 (10:49 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 13 Nov 2012 23:48:23 +0000 (10:48 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 13 Nov 2012 23:46:24 +0000 (10:46 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 13 Nov 2012 23:44:48 +0000 (10:44 +1100)]
Merge remote-tracking branch 'asm-generic/master'
projects / karo-tx-linux.git / log