]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 26 Sep 2012 05:32:37 +0000 (15:32 +1000)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/c6x/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/m68k/Kconfig
arch/mn10300/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
arch/x86/kernel/process_32.c
Stephen Rothwell [Wed, 26 Sep 2012 05:23:03 +0000 (15:23 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/ubifs/debug.c
init/Kconfig
kernel/audit.c
kernel/auditsc.c
security/integrity/ima/ima_policy.c
Stephen Rothwell [Wed, 26 Sep 2012 05:21:20 +0000 (15:21 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 05:19:41 +0000 (15:19 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Conflicts:
Documentation/devicetree/bindings/ata/ahci-platform.txt
arch/arm/boot/dts/highbank.dts
Stephen Rothwell [Wed, 26 Sep 2012 05:17:56 +0000 (15:17 +1000)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Wed, 26 Sep 2012 05:16:15 +0000 (15:16 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/Makefile.boot
Stephen Rothwell [Wed, 26 Sep 2012 05:14:22 +0000 (15:14 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 26 Sep 2012 05:12:50 +0000 (15:12 +1000)]
Merge remote-tracking branch 'msm/for-next'
Conflicts:
arch/arm/mach-msm/board-dt-8660.c
arch/arm/mach-msm/board-dt-8960.c
arch/arm/mach-msm/common.h
arch/arm/mach-vt8500/include/mach/restart.h
Stephen Rothwell [Wed, 26 Sep 2012 05:05:24 +0000 (15:05 +1000)]
Merge remote-tracking branch 'ixp4xx/next'
Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
Stephen Rothwell [Wed, 26 Sep 2012 05:03:39 +0000 (15:03 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:58:59 +0000 (14:58 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
drivers/clocksource/Makefile
drivers/dma/mmp_tdma.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mfd/db8500-prcmu.c
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
drivers/spi/spi-davinci.c
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c
Stephen Rothwell [Wed, 26 Sep 2012 04:45:41 +0000 (14:45 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:44:01 +0000 (14:44 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:43:54 +0000 (14:43 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 26 Sep 2012 04:42:08 +0000 (14:42 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:40:26 +0000 (14:40 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:34:13 +0000 (14:34 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:32:32 +0000 (14:32 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:27:56 +0000 (14:27 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c
Stephen Rothwell [Wed, 26 Sep 2012 04:25:36 +0000 (14:25 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/core/usb-acpi.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
Stephen Rothwell [Wed, 26 Sep 2012 04:23:13 +0000 (14:23 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Wed, 26 Sep 2012 04:15:59 +0000 (14:15 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:14:04 +0000 (14:14 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:12:19 +0000 (14:12 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:10:36 +0000 (14:10 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 04:03:22 +0000 (14:03 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
drivers/hid/hid-picolcd.c
drivers/isdn/mISDN/hwchannel.c
drivers/thermal/thermal_sys.c
drivers/video/omap2/displays/panel-taal.c
Stephen Rothwell [Wed, 26 Sep 2012 03:54:24 +0000 (13:54 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:52:39 +0000 (13:52 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:50:54 +0000 (13:50 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Wed, 26 Sep 2012 03:49:06 +0000 (13:49 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 26 Sep 2012 03:41:51 +0000 (13:41 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 26 Sep 2012 03:34:26 +0000 (13:34 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
arch/s390/Kconfig
Stephen Rothwell [Wed, 26 Sep 2012 03:32:48 +0000 (13:32 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:30:45 +0000 (13:30 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:30:38 +0000 (13:30 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Wed, 26 Sep 2012 03:28:53 +0000 (13:28 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 26 Sep 2012 03:27:12 +0000 (13:27 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 26 Sep 2012 03:19:54 +0000 (13:19 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:13:35 +0000 (13:13 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Wed, 26 Sep 2012 03:11:50 +0000 (13:11 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:10:10 +0000 (13:10 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 26 Sep 2012 03:10:05 +0000 (13:10 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 26 Sep 2012 03:09:59 +0000 (13:09 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 26 Sep 2012 03:05:34 +0000 (13:05 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 26 Sep 2012 03:03:54 +0000 (13:03 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Wed, 26 Sep 2012 03:02:12 +0000 (13:02 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 03:00:35 +0000 (13:00 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:58:58 +0000 (12:58 +1000)]
Merge remote-tracking branch 'battery/master'
Conflicts:
include/linux/mfd/88pm860x.h
Stephen Rothwell [Wed, 26 Sep 2012 02:51:52 +0000 (12:51 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/mfd/tps65217.c
drivers/regulator/anatop-regulator.c
Stephen Rothwell [Wed, 26 Sep 2012 02:50:08 +0000 (12:50 +1000)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Wed, 26 Sep 2012 02:43:12 +0000 (12:43 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:41:31 +0000 (12:41 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:39:51 +0000 (12:39 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:38:06 +0000 (12:38 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 26 Sep 2012 02:31:38 +0000 (12:31 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:27:21 +0000 (12:27 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:25:40 +0000 (12:25 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 26 Sep 2012 02:20:26 +0000 (12:20 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/xtensa/Kconfig
Stephen Rothwell [Wed, 26 Sep 2012 02:17:09 +0000 (12:17 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 02:12:14 +0000 (12:12 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Wed, 26 Sep 2012 02:10:21 +0000 (12:10 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Wed, 26 Sep 2012 02:08:34 +0000 (12:08 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 26 Sep 2012 02:05:13 +0000 (12:05 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 26 Sep 2012 02:03:15 +0000 (12:03 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/pci.c
Stephen Rothwell [Wed, 26 Sep 2012 01:46:19 +0000 (11:46 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/team/team.c
drivers/net/usb/qmi_wwan.c
net/batman-adv/bat_iv_ogm.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/socket.c
Stephen Rothwell [Wed, 26 Sep 2012 01:37:45 +0000 (11:37 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:36:02 +0000 (11:36 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:32:34 +0000 (11:32 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Wed, 26 Sep 2012 01:30:56 +0000 (11:30 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:29:21 +0000 (11:29 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:27:43 +0000 (11:27 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:26:08 +0000 (11:26 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:26:01 +0000 (11:26 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 26 Sep 2012 01:24:09 +0000 (11:24 +1000)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:22:34 +0000 (11:22 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Wed, 26 Sep 2012 01:20:41 +0000 (11:20 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:19:02 +0000 (11:19 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 26 Sep 2012 01:17:28 +0000 (11:17 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:15:46 +0000 (11:15 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:13:42 +0000 (11:13 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Wed, 26 Sep 2012 01:12:09 +0000 (11:12 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:10:41 +0000 (11:10 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 26 Sep 2012 01:09:14 +0000 (11:09 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:07:44 +0000 (11:07 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 26 Sep 2012 01:05:54 +0000 (11:05 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 01:04:29 +0000 (11:04 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:03:03 +0000 (11:03 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 26 Sep 2012 01:00:31 +0000 (11:00 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 26 Sep 2012 00:57:09 +0000 (10:57 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 26 Sep 2012 00:50:44 +0000 (10:50 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/stat.c
kernel/events/core.c
Stephen Rothwell [Wed, 26 Sep 2012 00:49:09 +0000 (10:49 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:47:42 +0000 (10:47 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:46:12 +0000 (10:46 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:44:37 +0000 (10:44 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:43:07 +0000 (10:43 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:41:29 +0000 (10:41 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:40:04 +0000 (10:40 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 26 Sep 2012 00:38:36 +0000 (10:38 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 26 Sep 2012 00:37:09 +0000 (10:37 +1000)]
Merge remote-tracking branch 'gfs2/master'
projects / karo-tx-linux.git / log