]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 24 Aug 2011 05:19:59 +0000 (15:19 +1000)]
Merge remote-tracking branch 'kvmtool/master'
Conflicts:
include/net/9p/9p.h
Stephen Rothwell [Wed, 24 Aug 2011 05:00:43 +0000 (15:00 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'
Conflicts:
drivers/staging/iio/accel/adis16220_core.c
include/linux/dmaengine.h
Stephen Rothwell [Wed, 24 Aug 2011 04:48:00 +0000 (14:48 +1000)]
Merge remote-tracking branch 'writeback/next'
Stephen Rothwell [Wed, 24 Aug 2011 04:43:00 +0000 (14:43 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:41:32 +0000 (14:41 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/xgifb/XGI_main_26.c
Stephen Rothwell [Wed, 24 Aug 2011 04:35:19 +0000 (14:35 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:15:40 +0000 (14:15 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:14:17 +0000 (14:14 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:12:57 +0000 (14:12 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 24 Aug 2011 04:11:36 +0000 (14:11 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 24 Aug 2011 04:10:07 +0000 (14:10 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:08:51 +0000 (14:08 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:07:24 +0000 (14:07 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 04:07:14 +0000 (14:07 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Wed, 24 Aug 2011 04:00:15 +0000 (14:00 +1000)]
Revert "signal: Add block_sigmask() for adding sigmask to current->blocked"
This reverts commit
932e5a25b9cf6f3194570eacbe9c4d2e406707fc.
Stephen Rothwell [Wed, 24 Aug 2011 03:52:19 +0000 (13:52 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Wed, 24 Aug 2011 03:45:50 +0000 (13:45 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 24 Aug 2011 03:40:06 +0000 (13:40 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/mm/fault.c
Stephen Rothwell [Wed, 24 Aug 2011 03:39:42 +0000 (13:39 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Wed, 24 Aug 2011 03:38:21 +0000 (13:38 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Wed, 24 Aug 2011 03:36:34 +0000 (13:36 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Wed, 24 Aug 2011 03:33:47 +0000 (13:33 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:32:27 +0000 (13:32 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:26:10 +0000 (13:26 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
Stephen Rothwell [Wed, 24 Aug 2011 03:24:44 +0000 (13:24 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:23:24 +0000 (13:23 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:21:52 +0000 (13:21 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 24 Aug 2011 03:20:46 +0000 (13:20 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:18:15 +0000 (13:18 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Wed, 24 Aug 2011 03:16:47 +0000 (13:16 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:15:23 +0000 (13:15 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:13:57 +0000 (13:13 +1000)]
Merge remote-tracking branch 'fbdev/master'
Stephen Rothwell [Wed, 24 Aug 2011 03:12:32 +0000 (13:12 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:11:11 +0000 (13:11 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:11:04 +0000 (13:11 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:10:55 +0000 (13:10 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:09:34 +0000 (13:09 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 24 Aug 2011 03:09:27 +0000 (13:09 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Wed, 24 Aug 2011 03:07:24 +0000 (13:07 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 24 Aug 2011 03:05:53 +0000 (13:05 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 24 Aug 2011 03:04:23 +0000 (13:04 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 24 Aug 2011 03:03:03 +0000 (13:03 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 24 Aug 2011 03:01:48 +0000 (13:01 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 24 Aug 2011 03:00:27 +0000 (13:00 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:59:03 +0000 (12:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:53:46 +0000 (12:53 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:52:26 +0000 (12:52 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Wed, 24 Aug 2011 02:51:04 +0000 (12:51 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:49:24 +0000 (12:49 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:43:46 +0000 (12:43 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/Makefile
Stephen Rothwell [Wed, 24 Aug 2011 02:32:50 +0000 (12:32 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 24 Aug 2011 02:32:43 +0000 (12:32 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:32:37 +0000 (12:32 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:31:13 +0000 (12:31 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:30:00 +0000 (12:30 +1000)]
Merge remote-tracking branch 'cpupowerutils/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:28:43 +0000 (12:28 +1000)]
Merge remote-tracking branch 'acpi/test'
Stephen Rothwell [Wed, 24 Aug 2011 02:27:25 +0000 (12:27 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 24 Aug 2011 02:27:18 +0000 (12:27 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:25:57 +0000 (12:25 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:24:44 +0000 (12:24 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Wed, 24 Aug 2011 02:23:33 +0000 (12:23 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:22:22 +0000 (12:22 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 24 Aug 2011 02:21:10 +0000 (12:21 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 24 Aug 2011 02:19:52 +0000 (12:19 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:18:36 +0000 (12:18 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:17:24 +0000 (12:17 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:15:59 +0000 (12:15 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:14:48 +0000 (12:14 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:13:34 +0000 (12:13 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:12:21 +0000 (12:12 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:11:05 +0000 (12:11 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:09:47 +0000 (12:09 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 24 Aug 2011 02:08:32 +0000 (12:08 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:07:18 +0000 (12:07 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 02:06:06 +0000 (12:06 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 24 Aug 2011 02:04:55 +0000 (12:04 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 24 Aug 2011 02:03:42 +0000 (12:03 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 24 Aug 2011 02:02:28 +0000 (12:02 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 24 Aug 2011 02:01:09 +0000 (12:01 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 24 Aug 2011 01:59:56 +0000 (11:59 +1000)]
Merge remote-tracking branch '4xx/next'
Stephen Rothwell [Wed, 24 Aug 2011 01:58:43 +0000 (11:58 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 24 Aug 2011 01:57:26 +0000 (11:57 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:56:06 +0000 (11:56 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:54:52 +0000 (11:54 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:53:39 +0000 (11:53 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Wed, 24 Aug 2011 01:52:18 +0000 (11:52 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:51:04 +0000 (11:51 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:49:48 +0000 (11:49 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:48:32 +0000 (11:48 +1000)]
Merge remote-tracking branch 'msm/for-next'
Conflicts:
arch/arm/mach-msm/io.c
Stephen Rothwell [Wed, 24 Aug 2011 01:47:02 +0000 (11:47 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
Stephen Rothwell [Wed, 24 Aug 2011 01:45:43 +0000 (11:45 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:33 +0000 (11:43 +1000)]
Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:32 +0000 (11:43 +1000)]
Merge remote-tracking branch 'rmobile-current/rmobile-fixes-for-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:30 +0000 (11:43 +1000)]
Merge remote-tracking branch 'sh-current/sh-fixes-for-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:17 +0000 (11:43 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:15 +0000 (11:43 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:14 +0000 (11:43 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:13 +0000 (11:43 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:12 +0000 (11:43 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Wed, 24 Aug 2011 01:43:10 +0000 (11:43 +1000)]
Merge remote-tracking branch 'wireless-current/master'
projects / karo-tx-linux.git / log