]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 21 Sep 2011 04:17:24 +0000 (14:17 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Wed, 21 Sep 2011 04:13:55 +0000 (14:13 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 21 Sep 2011 04:12:33 +0000 (14:12 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 21 Sep 2011 04:11:05 +0000 (14:11 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 04:09:46 +0000 (14:09 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 04:08:21 +0000 (14:08 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 21 Sep 2011 04:02:54 +0000 (14:02 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Wed, 21 Sep 2011 03:57:03 +0000 (13:57 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Wed, 21 Sep 2011 03:55:42 +0000 (13:55 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
include/linux/kvm.h
Stephen Rothwell [Wed, 21 Sep 2011 03:43:53 +0000 (13:43 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 21 Sep 2011 03:37:28 +0000 (13:37 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 21 Sep 2011 03:36:07 +0000 (13:36 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Wed, 21 Sep 2011 03:34:51 +0000 (13:34 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Conflicts:
drivers/spi/spi-pl022.c
Stephen Rothwell [Wed, 21 Sep 2011 03:27:22 +0000 (13:27 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Wed, 21 Sep 2011 03:25:37 +0000 (13:25 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Wed, 21 Sep 2011 03:22:53 +0000 (13:22 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 03:21:30 +0000 (13:21 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 03:15:19 +0000 (13:15 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Wed, 21 Sep 2011 03:11:15 +0000 (13:11 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
drivers/net/Kconfig
Stephen Rothwell [Wed, 21 Sep 2011 03:09:50 +0000 (13:09 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 21 Sep 2011 03:08:26 +0000 (13:08 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 21 Sep 2011 03:08:15 +0000 (13:08 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 21 Sep 2011 03:07:34 +0000 (13:07 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Wed, 21 Sep 2011 03:04:59 +0000 (13:04 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Wed, 21 Sep 2011 03:03:36 +0000 (13:03 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 03:02:19 +0000 (13:02 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Wed, 21 Sep 2011 02:48:43 +0000 (12:48 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:47:23 +0000 (12:47 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Wed, 21 Sep 2011 02:45:56 +0000 (12:45 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
drivers/mfd/max8997.c
Stephen Rothwell [Wed, 21 Sep 2011 02:44:34 +0000 (12:44 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:38:16 +0000 (12:38 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:38:07 +0000 (12:38 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:36:46 +0000 (12:36 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:36:40 +0000 (12:36 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Wed, 21 Sep 2011 02:34:53 +0000 (12:34 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 21 Sep 2011 02:33:21 +0000 (12:33 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 21 Sep 2011 02:27:28 +0000 (12:27 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:25:32 +0000 (12:25 +1000)]
Revert "Input: gpio_keys - use of_property_read_u32()"
This reverts commit
d6ba97c9806bff7c91fe3ae5fec83488b1a56f73.
Stephen Rothwell [Wed, 21 Sep 2011 02:17:47 +0000 (12:17 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 21 Sep 2011 02:16:27 +0000 (12:16 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 21 Sep 2011 02:15:10 +0000 (12:15 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 21 Sep 2011 02:13:52 +0000 (12:13 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 02:11:54 +0000 (12:11 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Wed, 21 Sep 2011 02:06:31 +0000 (12:06 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 21 Sep 2011 02:05:13 +0000 (12:05 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Wed, 21 Sep 2011 02:03:17 +0000 (12:03 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +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 [Wed, 21 Sep 2011 01:48:02 +0000 (11:48 +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/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Wed, 21 Sep 2011 01:45:11 +0000 (11:45 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 21 Sep 2011 01:43:04 +0000 (11:43 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:43:00 +0000 (11:43 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:42:54 +0000 (11:42 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:41:37 +0000 (11:41 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:40:16 +0000 (11:40 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:38:56 +0000 (11:38 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 21 Sep 2011 01:38:50 +0000 (11:38 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:37:26 +0000 (11:37 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:36:04 +0000 (11:36 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Wed, 21 Sep 2011 01:34:54 +0000 (11:34 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Wed, 21 Sep 2011 01:33:33 +0000 (11:33 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:32:21 +0000 (11:32 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 21 Sep 2011 01:31:03 +0000 (11:31 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 21 Sep 2011 01:29:52 +0000 (11:29 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 21 Sep 2011 01:28:32 +0000 (11:28 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:27:05 +0000 (11:27 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Wed, 21 Sep 2011 01:25:51 +0000 (11:25 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Conflicts:
net/9p/trans_virtio.c
Stephen Rothwell [Wed, 21 Sep 2011 01:24:24 +0000 (11:24 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:18:26 +0000 (11:18 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:17:12 +0000 (11:17 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:15:57 +0000 (11:15 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:14:37 +0000 (11:14 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 21 Sep 2011 01:13:16 +0000 (11:13 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 01:12:05 +0000 (11:12 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:10:53 +0000 (11:10 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 21 Sep 2011 01:09:42 +0000 (11:09 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 21 Sep 2011 01:08:30 +0000 (11:08 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Wed, 21 Sep 2011 01:07:18 +0000 (11:07 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 21 Sep 2011 01:01:00 +0000 (11:01 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 21 Sep 2011 00:59:42 +0000 (10:59 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 21 Sep 2011 00:53:27 +0000 (10:53 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 21 Sep 2011 00:52:06 +0000 (10:52 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:50:48 +0000 (10:50 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:49:37 +0000 (10:49 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:48:24 +0000 (10:48 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Wed, 21 Sep 2011 00:47:06 +0000 (10:47 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 21 Sep 2011 00:45:49 +0000 (10:45 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:44:34 +0000 (10:44 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 21 Sep 2011 00:44:32 +0000 (10:44 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Wed, 21 Sep 2011 00:41:16 +0000 (10:41 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:39:57 +0000 (10:39 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Wed, 21 Sep 2011 00:39:49 +0000 (10:39 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 21 Sep 2011 00:38:36 +0000 (10:38 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-seaboard.dts
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 [Wed, 21 Sep 2011 00:34:39 +0000 (10:34 +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 [Wed, 21 Sep 2011 00:33:25 +0000 (10:33 +1000)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Stephen Rothwell [Wed, 21 Sep 2011 00:28:50 +0000 (10:28 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Wed, 21 Sep 2011 00:28:37 +0000 (10:28 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 21 Sep 2011 00:28:36 +0000 (10:28 +1000)]
Merge remote-tracking branch 'net-current/master'
Stephen Rothwell [Wed, 21 Sep 2011 00:28:33 +0000 (10:28 +1000)]
Merge remote-tracking branch 'arm-current/master'
Russell King [Tue, 20 Sep 2011 22:45:31 +0000 (23:45 +0100)]
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mm/dma-mapping.c
Russell King [Tue, 20 Sep 2011 22:45:08 +0000 (23:45 +0100)]
Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v', 'pgt' and 'pm' into for-next
projects / karo-tx-linux.git / log