]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 20 Sep 2011 06:46:30 +0000 (16:46 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
Stephen Rothwell [Tue, 20 Sep 2011 05:51:53 +0000 (15:51 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:49:56 +0000 (15:49 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:43:35 +0000 (15:43 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Tue, 20 Sep 2011 05:42:11 +0000 (15:42 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Tue, 20 Sep 2011 05:16:33 +0000 (15:16 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Tue, 20 Sep 2011 05:15:10 +0000 (15:15 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Tue, 20 Sep 2011 05:13:40 +0000 (15:13 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:12:23 +0000 (15:12 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:10:56 +0000 (15:10 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:05:29 +0000 (15:05 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Tue, 20 Sep 2011 04:59:36 +0000 (14:59 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Tue, 20 Sep 2011 04:58:11 +0000 (14:58 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:51:45 +0000 (14:51 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:45:24 +0000 (14:45 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 20 Sep 2011 04:45:16 +0000 (14:45 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Tue, 20 Sep 2011 04:43:55 +0000 (14:43 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Tue, 20 Sep 2011 04:42:10 +0000 (14:42 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Tue, 20 Sep 2011 04:39:27 +0000 (14:39 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:38:06 +0000 (14:38 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:31:56 +0000 (14:31 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Tue, 20 Sep 2011 04:27:51 +0000 (14:27 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
drivers/net/Kconfig
Stephen Rothwell [Tue, 20 Sep 2011 04:26:26 +0000 (14:26 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:25:06 +0000 (14:25 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:23:40 +0000 (14:23 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 20 Sep 2011 04:23:00 +0000 (14:23 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:20:23 +0000 (14:20 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Tue, 20 Sep 2011 04:19:01 +0000 (14:19 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:17:41 +0000 (14:17 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:16:18 +0000 (14:16 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:14:58 +0000 (14:14 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Tue, 20 Sep 2011 04:13:30 +0000 (14:13 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
drivers/mfd/max8997.c
drivers/rtc/rtc-twl.c
Stephen Rothwell [Tue, 20 Sep 2011 04:10:18 +0000 (14:10 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:04:01 +0000 (14:04 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:03:53 +0000 (14:03 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:02:32 +0000 (14:02 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:02:25 +0000 (14:02 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Tue, 20 Sep 2011 04:00:39 +0000 (14:00 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:59:07 +0000 (13:59 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 20 Sep 2011 03:53:15 +0000 (13:53 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 03:51:32 +0000 (13:51 +1000)]
Revert "Input: gpio_keys - use of_property_read_u32()"
This reverts commit
d6ba97c9806bff7c91fe3ae5fec83488b1a56f73.
Stephen Rothwell [Tue, 20 Sep 2011 03:50:40 +0000 (13:50 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 20 Sep 2011 03:49:21 +0000 (13:49 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Tue, 20 Sep 2011 03:48:04 +0000 (13:48 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 20 Sep 2011 03:46:41 +0000 (13:46 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 03:44:48 +0000 (13:44 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Tue, 20 Sep 2011 03:39:26 +0000 (13:39 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:38:08 +0000 (13:38 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Tue, 20 Sep 2011 03:29:48 +0000 (13:29 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:28:12 +0000 (13:28 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Tue, 20 Sep 2011 02:52:17 +0000 (12:52 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Tue, 20 Sep 2011 02:43:29 +0000 (12:43 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:23 +0000 (12:41 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:19 +0000 (12:41 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:14 +0000 (12:41 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:39:57 +0000 (12:39 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:38:33 +0000 (12:38 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 20 Sep 2011 02:38:28 +0000 (12:38 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:37:04 +0000 (12:37 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:35:44 +0000 (12:35 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 20 Sep 2011 02:34:33 +0000 (12:34 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 20 Sep 2011 02:33:13 +0000 (12:33 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:32:00 +0000 (12:32 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 20 Sep 2011 02:30:42 +0000 (12:30 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 20 Sep 2011 02:29:30 +0000 (12:29 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 20 Sep 2011 02:28:12 +0000 (12:28 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:26:45 +0000 (12:26 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Tue, 20 Sep 2011 02:25:32 +0000 (12:25 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Conflicts:
net/9p/trans_virtio.c
Stephen Rothwell [Tue, 20 Sep 2011 02:24:04 +0000 (12:24 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:18:08 +0000 (12:18 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:16:55 +0000 (12:16 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:15:40 +0000 (12:15 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:14:20 +0000 (12:14 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 20 Sep 2011 02:13:04 +0000 (12:13 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:11:50 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:10:39 +0000 (12:10 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:09:29 +0000 (12:09 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 20 Sep 2011 02:08:16 +0000 (12:08 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:07:04 +0000 (12:07 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 20 Sep 2011 02:05:53 +0000 (12:05 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 20 Sep 2011 01:59:36 +0000 (11:59 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 20 Sep 2011 01:58:20 +0000 (11:58 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 20 Sep 2011 01:57:07 +0000 (11:57 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 20 Sep 2011 01:55:47 +0000 (11:55 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:54:27 +0000 (11:54 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:53:15 +0000 (11:53 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:52:03 +0000 (11:52 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Tue, 20 Sep 2011 01:50:46 +0000 (11:50 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 20 Sep 2011 01:49:28 +0000 (11:49 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:48:17 +0000 (11:48 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 20 Sep 2011 01:47:06 +0000 (11:47 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Tue, 20 Sep 2011 01:41:38 +0000 (11:41 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Tue, 20 Sep 2011 01:39:35 +0000 (11:39 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Tue, 20 Sep 2011 01:39:28 +0000 (11:39 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:38:16 +0000 (11:38 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Tue, 20 Sep 2011 01:36:26 +0000 (11:36 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Tue, 20 Sep 2011 01:35:09 +0000 (11:35 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:33:57 +0000 (11:33 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Tue, 20 Sep 2011 01:33:44 +0000 (11:33 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Tue, 20 Sep 2011 01:33:44 +0000 (11:33 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
projects / karo-tx-linux.git / log