]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Jens Rottmann [Tue, 14 Aug 2012 03:22:23 +0000 (13:22 +1000)]
cs5535-clockevt: typo, it's MFGPT, not MFPGT
Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Fri, 17 Aug 2012 04:38:31 +0000 (14:38 +1000)]
Merge branch 'signal/from-sfr'
Conflicts:
arch/arm/include/asm/thread_info.h
arch/powerpc/kernel/entry_64.S
arch/x86/kernel/signal.c
Stephen Rothwell [Fri, 17 Aug 2012 04:33:47 +0000 (14:33 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:32:11 +0000 (14:32 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:30:34 +0000 (14:30 +1000)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Fri, 17 Aug 2012 04:29:01 +0000 (14:29 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:27:29 +0000 (14:27 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:27:24 +0000 (14:27 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:22:56 +0000 (14:22 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
drivers/mtd/nand/Kconfig
Stephen Rothwell [Fri, 17 Aug 2012 04:21:24 +0000 (14:21 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:21:09 +0000 (14:21 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Fri, 17 Aug 2012 04:19:34 +0000 (14:19 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:17:53 +0000 (14:17 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:16:24 +0000 (14:16 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/misc/mei/interrupt.c
Stephen Rothwell [Fri, 17 Aug 2012 04:05:10 +0000 (14:05 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:03:30 +0000 (14:03 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 17 Aug 2012 04:01:20 +0000 (14:01 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:41:32 +0000 (13:41 +1000)]
Merge commit 'refs/next/
20120816/driver-core'
Stephen Rothwell [Fri, 17 Aug 2012 03:20:56 +0000 (13:20 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:19:13 +0000 (13:19 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:12:01 +0000 (13:12 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:10:19 +0000 (13:10 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:08:38 +0000 (13:08 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Fri, 17 Aug 2012 03:06:58 +0000 (13:06 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
Stephen Rothwell [Fri, 17 Aug 2012 03:05:21 +0000 (13:05 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 17 Aug 2012 02:58:08 +0000 (12:58 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h
Stephen Rothwell [Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)]
Merge commit 'refs/next/
20120814/tip'
Stephen Rothwell [Fri, 17 Aug 2012 02:19:37 +0000 (12:19 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:17:41 +0000 (12:17 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 17 Aug 2012 02:17:27 +0000 (12:17 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 17 Aug 2012 02:15:45 +0000 (12:15 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:08:49 +0000 (12:08 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:02:38 +0000 (12:02 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:01:05 +0000 (12:01 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:01:01 +0000 (12:01 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:59:32 +0000 (11:59 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:57:52 +0000 (11:57 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:57:46 +0000 (11:57 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:55:39 +0000 (11:55 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:54:03 +0000 (11:54 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:52:14 +0000 (11:52 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:50:42 +0000 (11:50 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:49:10 +0000 (11:49 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:47:38 +0000 (11:47 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:45:04 +0000 (11:45 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:45:01 +0000 (11:45 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:43:28 +0000 (11:43 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:38:19 +0000 (11:38 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Fri, 17 Aug 2012 01:36:42 +0000 (11:36 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:35:02 +0000 (11:35 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:35:00 +0000 (11:35 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:33:25 +0000 (11:33 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:31:48 +0000 (11:31 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:30:14 +0000 (11:30 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:28:42 +0000 (11:28 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:21:35 +0000 (11:21 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:20:01 +0000 (11:20 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:19:53 +0000 (11:19 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Fri, 17 Aug 2012 01:18:11 +0000 (11:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/ata/libata-core.c
Stephen Rothwell [Fri, 17 Aug 2012 01:16:42 +0000 (11:16 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:15:11 +0000 (11:15 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:13:36 +0000 (11:13 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:13:29 +0000 (11:13 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
Stephen Rothwell [Fri, 17 Aug 2012 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:10:21 +0000 (11:10 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:10:13 +0000 (11:10 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:00:51 +0000 (11:00 +1000)]
Merge commit 'refs/next/
20120816/v4l-dvb'
Stephen Rothwell [Fri, 17 Aug 2012 00:52:42 +0000 (10:52 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:51:20 +0000 (10:51 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 17 Aug 2012 00:49:55 +0000 (10:49 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 17 Aug 2012 00:48:27 +0000 (10:48 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:47:03 +0000 (10:47 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:45:32 +0000 (10:45 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:43:57 +0000 (10:43 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:42:30 +0000 (10:42 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:40:52 +0000 (10:40 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:39:24 +0000 (10:39 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:37:58 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 17 Aug 2012 00:36:29 +0000 (10:36 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:35:04 +0000 (10:35 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 17 Aug 2012 00:33:40 +0000 (10:33 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 17 Aug 2012 00:32:16 +0000 (10:32 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 17 Aug 2012 00:29:50 +0000 (10:29 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:28:25 +0000 (10:28 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:27:00 +0000 (10:27 +1000)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:25:37 +0000 (10:25 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:24:14 +0000 (10:24 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:22:44 +0000 (10:22 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:21:17 +0000 (10:21 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:19:49 +0000 (10:19 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 17 Aug 2012 00:18:25 +0000 (10:18 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:49 +0000 (10:14 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:47 +0000 (10:14 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:40 +0000 (10:14 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:37 +0000 (10:14 +1000)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:36 +0000 (10:14 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:35 +0000 (10:14 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:34 +0000 (10:14 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:33 +0000 (10:14 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
projects / karo-tx-linux.git / log