]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 5 Dec 2012 04:21:40 +0000 (15:21 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 5 Dec 2012 04:21:33 +0000 (15:21 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Wed, 5 Dec 2012 04:21:29 +0000 (15:21 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 5 Dec 2012 04:19:46 +0000 (15:19 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 04:19:40 +0000 (15:19 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 04:17:50 +0000 (15:17 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/dbx5x0.dtsi
arch/arm/boot/dts/snowball.dts
arch/arm/boot/dts/spear1340.dtsi
arch/arm/boot/dts/spear13xx.dtsi
arch/arm/configs/afeb9260_defconfig
arch/arm/configs/stamp9g20_defconfig
arch/arm/mach-davinci/devices-da8xx.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-spear13xx/spear1310.c
arch/arm/mach-spear13xx/spear13xx.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500-stuib.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/common.c
drivers/dma/mv_xor.c
drivers/leds/leds-ns2.c
drivers/media/platform/omap/omap_vout.c
drivers/mfd/Makefile
drivers/mtd/nand/mxc_nand.c
drivers/net/ethernet/cadence/at91_ether.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/power/Kconfig
drivers/tty/serial/atmel_serial.c
drivers/usb/host/ehci-orion.c
include/linux/platform_data/mmc-omap.h
Stephen Rothwell [Wed, 5 Dec 2012 04:06:19 +0000 (15:06 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 04:04:29 +0000 (15:04 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Conflicts:
drivers/gpio/gpio-em.c
Stephen Rothwell [Wed, 5 Dec 2012 04:02:37 +0000 (15:02 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Wed, 5 Dec 2012 04:00:43 +0000 (15:00 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
arch/arm/boot/dts/spear1340.dtsi
Stephen Rothwell [Wed, 5 Dec 2012 03:58:35 +0000 (14:58 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/mfd/rtsx_pcr.c
drivers/misc/atmel-ssc.c
drivers/mmc/host/Kconfig
drivers/mmc/host/rtsx_pci_sdmmc.c
Stephen Rothwell [Wed, 5 Dec 2012 03:56:28 +0000 (14:56 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/dgrp/dgrp_tty.c
drivers/staging/fwserial/fwserial.c
Stephen Rothwell [Wed, 5 Dec 2012 03:54:10 +0000 (14:54 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:50:15 +0000 (14:50 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
drivers/tty/serial/xilinx_uartps.c
Stephen Rothwell [Wed, 5 Dec 2012 03:42:34 +0000 (14:42 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/dma/dw_dmac.c
drivers/gpio/gpio-tps6586x.c
drivers/mfd/ab8500-core.c
drivers/mfd/da9052-core.c
drivers/mfd/sta2x11-mfd.c
drivers/mfd/tps65090.c
drivers/pci/pci.h
drivers/pci/quirks.c
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/da9052-battery.c
drivers/power/max8925_power.c
lib/Makefile
Stephen Rothwell [Wed, 5 Dec 2012 03:40:31 +0000 (14:40 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:38:41 +0000 (14:38 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:36:39 +0000 (14:36 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:34:59 +0000 (14:34 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:33:18 +0000 (14:33 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:26:38 +0000 (14:26 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 5 Dec 2012 03:19:02 +0000 (14:19 +1100)]
Merge remote-tracking branch 'fw-nohz/nohz/printk-v8'
Stephen Rothwell [Wed, 5 Dec 2012 03:12:26 +0000 (14:12 +1100)]
Merge remote-tracking branch 'fw-sched/sched/cputime-v2'
Stephen Rothwell [Wed, 5 Dec 2012 03:05:27 +0000 (14:05 +1100)]
Merge remote-tracking branch 'fw-cputime/cputime/adjustment-v2'
Stephen Rothwell [Wed, 5 Dec 2012 03:02:42 +0000 (14:02 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:55:05 +0000 (13:55 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
kernel/sched/core.c
Stephen Rothwell [Wed, 5 Dec 2012 02:47:24 +0000 (13:47 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/x86/kernel/ptrace.c
Stephen Rothwell [Wed, 5 Dec 2012 02:45:17 +0000 (13:45 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:37:34 +0000 (13:37 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
tools/perf/Makefile
Stephen Rothwell [Wed, 5 Dec 2012 02:35:51 +0000 (13:35 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:33:54 +0000 (13:33 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Wed, 5 Dec 2012 02:32:13 +0000 (13:32 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:29:22 +0000 (13:29 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 5 Dec 2012 02:27:42 +0000 (13:27 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:25:53 +0000 (13:25 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 5 Dec 2012 02:24:12 +0000 (13:24 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 5 Dec 2012 02:16:26 +0000 (13:16 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:12:21 +0000 (13:12 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:12:15 +0000 (13:12 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 5 Dec 2012 02:10:35 +0000 (13:10 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 5 Dec 2012 02:05:16 +0000 (13:05 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 5 Dec 2012 02:03:25 +0000 (13:03 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 5 Dec 2012 02:03:19 +0000 (13:03 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 5 Dec 2012 01:56:13 +0000 (12:56 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
Stephen Rothwell [Wed, 5 Dec 2012 01:54:15 +0000 (12:54 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
include/linux/mfd/tps65090.h
Stephen Rothwell [Wed, 5 Dec 2012 01:52:31 +0000 (12:52 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:50:44 +0000 (12:50 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 5 Dec 2012 01:49:03 +0000 (12:49 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
drivers/input/touchscreen/ti_tscadc.c
drivers/mfd/twl-core.c
drivers/mmc/host/Kconfig
Stephen Rothwell [Wed, 5 Dec 2012 01:36:53 +0000 (12:36 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:29:28 +0000 (12:29 +1100)]
Merge remote-tracking branch 'slab/for-next'
Conflicts:
mm/slob.c
Stephen Rothwell [Wed, 5 Dec 2012 01:29:16 +0000 (12:29 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:27:33 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:25:41 +0000 (12:25 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 5 Dec 2012 01:18:09 +0000 (12:18 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:13:46 +0000 (12:13 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
net/sched/cls_cgroup.c
Stephen Rothwell [Wed, 5 Dec 2012 01:11:43 +0000 (12:11 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 5 Dec 2012 01:10:06 +0000 (12:10 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:02:36 +0000 (12:02 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:59:52 +0000 (11:59 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:57:51 +0000 (11:57 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:50:20 +0000 (11:50 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
Stephen Rothwell [Wed, 5 Dec 2012 00:48:41 +0000 (11:48 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:46:54 +0000 (11:46 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:45:00 +0000 (11:45 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:37:24 +0000 (11:37 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/m68k/include/uapi/asm/socket.h
drivers/net/ethernet/mellanox/mlx4/en_rx.c
Stephen Rothwell [Wed, 5 Dec 2012 00:06:22 +0000 (11:06 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 5 Dec 2012 00:04:22 +0000 (11:04 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Conflicts:
drivers/target/target_core_transport.c
Stephen Rothwell [Tue, 4 Dec 2012 23:59:51 +0000 (10:59 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:54:40 +0000 (10:54 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:53:04 +0000 (10:53 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:51:27 +0000 (10:51 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:49:48 +0000 (10:49 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:48:07 +0000 (10:48 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:47:59 +0000 (10:47 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Tue, 4 Dec 2012 23:41:31 +0000 (10:41 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:39:55 +0000 (10:39 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:38:13 +0000 (10:38 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:36:25 +0000 (10:36 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 4 Dec 2012 23:34:34 +0000 (10:34 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:32:37 +0000 (10:32 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:31:03 +0000 (10:31 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:29:30 +0000 (10:29 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:27:54 +0000 (10:27 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Tue, 4 Dec 2012 23:26:23 +0000 (10:26 +1100)]
Merge branch 'i2c/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:24:28 +0000 (10:24 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:21:00 +0000 (10:21 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:19:15 +0000 (10:19 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_fsops.c
Stephen Rothwell [Tue, 4 Dec 2012 23:19:06 +0000 (10:19 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:17:12 +0000 (10:17 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:15:27 +0000 (10:15 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:13:50 +0000 (10:13 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:12:11 +0000 (10:12 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:10:39 +0000 (10:10 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:04:06 +0000 (10:04 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:59:30 +0000 (09:59 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 4 Dec 2012 22:57:49 +0000 (09:57 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 4 Dec 2012 22:56:20 +0000 (09:56 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 4 Dec 2012 22:54:52 +0000 (09:54 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:53:18 +0000 (09:53 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:51:36 +0000 (09:51 +1100)]
Merge remote-tracking branch 'ceph/master'
projects / karo-tx-linux.git / log