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