]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 28 Sep 2012 05:20:03 +0000 (15:20 +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 [Fri, 28 Sep 2012 04:54:45 +0000 (14:54 +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 [Fri, 28 Sep 2012 04:52:57 +0000 (14:52 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:48:12 +0000 (14:48 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/include/asm/timex.h
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/pinctrl/Makefile
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 [Fri, 28 Sep 2012 04:44:38 +0000 (14:44 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:42:58 +0000 (14:42 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:42:51 +0000 (14:42 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Fri, 28 Sep 2012 04:41:02 +0000 (14:41 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:39:13 +0000 (14:39 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:33:00 +0000 (14:33 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:31:16 +0000 (14:31 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/char/pcmcia/synclink_cs.c
Stephen Rothwell [Fri, 28 Sep 2012 04:26:35 +0000 (14:26 +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 [Fri, 28 Sep 2012 04:24:12 +0000 (14:24 +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 [Fri, 28 Sep 2012 04:20:22 +0000 (14:20 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Fri, 28 Sep 2012 04:12:12 +0000 (14:12 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:10:18 +0000 (14:10 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:08:33 +0000 (14:08 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 04:06:50 +0000 (14:06 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:59:35 +0000 (13:59 +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 [Fri, 28 Sep 2012 03:50:56 +0000 (13:50 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:49:09 +0000 (13:49 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:47:26 +0000 (13:47 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Fri, 28 Sep 2012 03:45:38 +0000 (13:45 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 28 Sep 2012 03:38:06 +0000 (13:38 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
Stephen Rothwell [Fri, 28 Sep 2012 03:22:11 +0000 (13:22 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:20:07 +0000 (13:20 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:20:00 +0000 (13:20 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 28 Sep 2012 03:18:09 +0000 (13:18 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 28 Sep 2012 03:16:28 +0000 (13:16 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Fri, 28 Sep 2012 03:09:07 +0000 (13:09 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 03:02:45 +0000 (13:02 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Fri, 28 Sep 2012 03:01:00 +0000 (13:01 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:59:18 +0000 (12:59 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 28 Sep 2012 02:57:35 +0000 (12:57 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 28 Sep 2012 02:57:30 +0000 (12:57 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 28 Sep 2012 02:53:00 +0000 (12:53 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 28 Sep 2012 02:51:19 +0000 (12:51 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Fri, 28 Sep 2012 02:49:34 +0000 (12:49 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:47:56 +0000 (12:47 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:46:14 +0000 (12:46 +1000)]
Merge remote-tracking branch 'battery/master'
Conflicts:
include/linux/mfd/88pm860x.h
Stephen Rothwell [Fri, 28 Sep 2012 02:39:04 +0000 (12:39 +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 [Fri, 28 Sep 2012 02:37:16 +0000 (12:37 +1000)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Fri, 28 Sep 2012 02:30:17 +0000 (12:30 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:28:40 +0000 (12:28 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:27:03 +0000 (12:27 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:25:16 +0000 (12:25 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 28 Sep 2012 02:18:24 +0000 (12:18 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:14:05 +0000 (12:14 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 02:12:22 +0000 (12:12 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 28 Sep 2012 02:07:05 +0000 (12:07 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/xtensa/Kconfig
Stephen Rothwell [Fri, 28 Sep 2012 02:05:17 +0000 (12:05 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 01:59:29 +0000 (11:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Fri, 28 Sep 2012 01:57:33 +0000 (11:57 +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 [Fri, 28 Sep 2012 01:55:47 +0000 (11:55 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Fri, 28 Sep 2012 01:54:02 +0000 (11:54 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 28 Sep 2012 01:52:23 +0000 (11:52 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 28 Sep 2012 01:50:46 +0000 (11:50 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 28 Sep 2012 01:48:50 +0000 (11:48 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/pci.c
Stephen Rothwell [Fri, 28 Sep 2012 01:42:03 +0000 (11:42 +1000)]
Revert "be2net: fix vfs enumeration"
This reverts commit
51af6d7c1f31e0f3d42c87d53657ec7acb6e3462.
Stephen Rothwell [Fri, 28 Sep 2012 01:35:43 +0000 (11:35 +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/l2tp/l2tp_netlink.c
net/socket.c
Stephen Rothwell [Fri, 28 Sep 2012 01:27:52 +0000 (11:27 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 28 Sep 2012 01:26:03 +0000 (11:26 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 01:22:32 +0000 (11:22 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Fri, 28 Sep 2012 01:20:55 +0000 (11:20 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 28 Sep 2012 01:19:15 +0000 (11:19 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 01:17:37 +0000 (11:17 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 01:16:01 +0000 (11:16 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 28 Sep 2012 01:15:54 +0000 (11:15 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Fri, 28 Sep 2012 01:14:01 +0000 (11:14 +1000)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Fri, 28 Sep 2012 01:12:26 +0000 (11:12 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 28 Sep 2012 01:10:43 +0000 (11:10 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Conflicts:
drivers/net/ethernet/mellanox/mlx4/mlx4.h
Stephen Rothwell [Fri, 28 Sep 2012 00:55:10 +0000 (10:55 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 28 Sep 2012 00:53:34 +0000 (10:53 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:51:49 +0000 (10:51 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:49:47 +0000 (10:49 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:46:50 +0000 (10:46 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 28 Sep 2012 00:45:19 +0000 (10:45 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:43:51 +0000 (10:43 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 28 Sep 2012 00:42:02 +0000 (10:42 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:40:35 +0000 (10:40 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 28 Sep 2012 00:38:02 +0000 (10:38 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 28 Sep 2012 00:34:38 +0000 (10:34 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 28 Sep 2012 00:27:53 +0000 (10:27 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:26:17 +0000 (10:26 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:24:49 +0000 (10:24 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:23:19 +0000 (10:23 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:21:43 +0000 (10:21 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:20:08 +0000 (10:20 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:18:26 +0000 (10:18 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:17:02 +0000 (10:17 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 28 Sep 2012 00:15:33 +0000 (10:15 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:14:05 +0000 (10:14 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 28 Sep 2012 00:12:32 +0000 (10:12 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:10:59 +0000 (10:10 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 28 Sep 2012 00:09:31 +0000 (10:09 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 28 Sep 2012 00:07:56 +0000 (10:07 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 28 Sep 2012 00:06:29 +0000 (10:06 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 28 Sep 2012 00:04:58 +0000 (10:04 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 28 Sep 2012 00:03:31 +0000 (10:03 +1000)]
Merge remote-tracking branch 'sparc-next/master'
projects / karo-tx-linux.git / log