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