]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 25 Jul 2012 02:46:27 +0000 (12:46 +1000)]
Merge branch 'signal/from-sfr'
Conflicts:
arch/arm/include/asm/thread_info.h
arch/powerpc/kernel/entry_64.S
Stephen Rothwell [Wed, 25 Jul 2012 02:44:47 +0000 (12:44 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:42:07 +0000 (12:42 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/plat-samsung/Makefile
drivers/pwm/pwm-samsung.c
Stephen Rothwell [Wed, 25 Jul 2012 02:35:23 +0000 (12:35 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:35:12 +0000 (12:35 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:35:04 +0000 (12:35 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:34:59 +0000 (12:34 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:30:38 +0000 (12:30 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:29:01 +0000 (12:29 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Conflicts:
drivers/gpio/gpio-mxc.c
Stephen Rothwell [Wed, 25 Jul 2012 02:25:48 +0000 (12:25 +1000)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Wed, 25 Jul 2012 02:24:11 +0000 (12:24 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Conflicts:
drivers/remoteproc/remoteproc_core.c
Stephen Rothwell [Wed, 25 Jul 2012 02:17:43 +0000 (12:17 +1000)]
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
Stephen Rothwell [Wed, 25 Jul 2012 02:17:38 +0000 (12:17 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 25 Jul 2012 02:14:52 +0000 (12:14 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Conflicts:
fs/sync.c
Stephen Rothwell [Wed, 25 Jul 2012 02:14:47 +0000 (12:14 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:13:15 +0000 (12:13 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 25 Jul 2012 02:11:20 +0000 (12:11 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/comedi/drivers/s626.h
drivers/staging/gdm72xx/netlink_k.c
Stephen Rothwell [Wed, 25 Jul 2012 02:06:53 +0000 (12:06 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
include/scsi/scsi_device.h
Stephen Rothwell [Wed, 25 Jul 2012 02:04:35 +0000 (12:04 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:58:06 +0000 (11:58 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:56:19 +0000 (11:56 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:54:38 +0000 (11:54 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:52:08 +0000 (11:52 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:50:27 +0000 (11:50 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:50:18 +0000 (11:50 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/kvm/booke_interrupts.S
Stephen Rothwell [Wed, 25 Jul 2012 01:48:41 +0000 (11:48 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 25 Jul 2012 01:39:57 +0000 (11:39 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:39:53 +0000 (11:39 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Wed, 25 Jul 2012 01:39:47 +0000 (11:39 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 25 Jul 2012 01:39:43 +0000 (11:39 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Wed, 25 Jul 2012 01:38:07 +0000 (11:38 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 25 Jul 2012 01:36:31 +0000 (11:36 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:36:27 +0000 (11:36 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:34:46 +0000 (11:34 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:33:12 +0000 (11:33 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 25 Jul 2012 01:26:47 +0000 (11:26 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 25 Jul 2012 01:25:14 +0000 (11:25 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 25 Jul 2012 01:25:09 +0000 (11:25 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 25 Jul 2012 01:23:29 +0000 (11:23 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c
Stephen Rothwell [Wed, 25 Jul 2012 01:21:53 +0000 (11:21 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:20:18 +0000 (11:20 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 25 Jul 2012 01:18:47 +0000 (11:18 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/configs/tegra_defconfig
drivers/mfd/mc13xxx-spi.c
drivers/regulator/s5m8767.c
include/linux/mfd/s5m87xx/s5m-core.h
Stephen Rothwell [Wed, 25 Jul 2012 01:10:20 +0000 (11:10 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:03:19 +0000 (11:03 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 01:01:25 +0000 (11:01 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 25 Jul 2012 01:01:22 +0000 (11:01 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:57:21 +0000 (10:57 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:55:27 +0000 (10:55 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 25 Jul 2012 00:48:26 +0000 (10:48 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 25 Jul 2012 00:46:53 +0000 (10:46 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:43:28 +0000 (10:43 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
include/linux/pci_regs.h
Stephen Rothwell [Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 25 Jul 2012 00:40:14 +0000 (10:40 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-imx/clk-imx6q.c
Stephen Rothwell [Wed, 25 Jul 2012 00:38:37 +0000 (10:38 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 25 Jul 2012 00:37:03 +0000 (10:37 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 25 Jul 2012 00:33:00 +0000 (10:33 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/mmc/host/sh_mmcif.c
Stephen Rothwell [Wed, 25 Jul 2012 00:31:22 +0000 (10:31 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Wed, 25 Jul 2012 00:29:44 +0000 (10:29 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Wed, 25 Jul 2012 00:27:34 +0000 (10:27 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/ata/libata-core.c
include/scsi/scsi_device.h
Stephen Rothwell [Wed, 25 Jul 2012 00:25:56 +0000 (10:25 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 25 Jul 2012 00:24:18 +0000 (10:24 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:24:06 +0000 (10:24 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
Stephen Rothwell [Wed, 25 Jul 2012 00:22:14 +0000 (10:22 +1000)]
Merge remote-tracking branch 'acpi/next'
Conflicts:
drivers/pci/pci-acpi.c
Stephen Rothwell [Wed, 25 Jul 2012 00:21:58 +0000 (10:21 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:19:53 +0000 (10:19 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 25 Jul 2012 00:18:17 +0000 (10:18 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:14:02 +0000 (10:14 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
Documentation/feature-removal-schedule.txt
Stephen Rothwell [Wed, 25 Jul 2012 00:12:32 +0000 (10:12 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 25 Jul 2012 00:11:02 +0000 (10:11 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Conflicts:
drivers/i2c/busses/i2c-nomadik.c
Stephen Rothwell [Wed, 25 Jul 2012 00:10:55 +0000 (10:10 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Wed, 25 Jul 2012 00:10:40 +0000 (10:10 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 25 Jul 2012 00:10:23 +0000 (10:10 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:07:02 +0000 (10:07 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 25 Jul 2012 00:05:27 +0000 (10:05 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_buf.c
fs/xfs/xfs_log.c
fs/xfs/xfs_log_priv.h
Stephen Rothwell [Wed, 25 Jul 2012 00:03:48 +0000 (10:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:02:04 +0000 (10:02 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 25 Jul 2012 00:00:28 +0000 (10:00 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 24 Jul 2012 23:55:58 +0000 (09:55 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 24 Jul 2012 23:54:33 +0000 (09:54 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:53:03 +0000 (09:53 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 24 Jul 2012 23:51:38 +0000 (09:51 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 24 Jul 2012 23:50:14 +0000 (09:50 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 24 Jul 2012 23:48:41 +0000 (09:48 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:47:16 +0000 (09:47 +1000)]
Merge remote-tracking branch 'ceph/master'
Conflicts:
net/ceph/messenger.c
net/ceph/osd_client.c
Stephen Rothwell [Tue, 24 Jul 2012 23:45:42 +0000 (09:45 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 24 Jul 2012 23:44:15 +0000 (09:44 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Tue, 24 Jul 2012 23:42:51 +0000 (09:42 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:39:54 +0000 (09:39 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:38:26 +0000 (09:38 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:38:14 +0000 (09:38 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 24 Jul 2012 23:36:49 +0000 (09:36 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 24 Jul 2012 23:35:24 +0000 (09:35 +1000)]
Merge remote-tracking branch 'gpio-current/gpio/merge'
Stephen Rothwell [Tue, 24 Jul 2012 23:35:21 +0000 (09:35 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Tue, 24 Jul 2012 23:35:19 +0000 (09:35 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 24 Jul 2012 23:34:54 +0000 (09:34 +1000)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Tue, 24 Jul 2012 23:34:51 +0000 (09:34 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Tue, 24 Jul 2012 23:34:49 +0000 (09:34 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
projects / karo-tx-linux.git / log