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