]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 27 Sep 2011 05:41:28 +0000 (15:41 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 05:40:06 +0000 (15:40 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 27 Sep 2011 05:34:30 +0000 (15:34 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Tue, 27 Sep 2011 05:28:31 +0000 (15:28 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Tue, 27 Sep 2011 05:27:08 +0000 (15:27 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
include/linux/kvm.h
Stephen Rothwell [Tue, 27 Sep 2011 05:20:33 +0000 (15:20 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/process_64.c
Stephen Rothwell [Tue, 27 Sep 2011 04:56:52 +0000 (14:56 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/iommu/Makefile
Stephen Rothwell [Tue, 27 Sep 2011 04:44:16 +0000 (14:44 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 27 Sep 2011 04:42:57 +0000 (14:42 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Tue, 27 Sep 2011 04:40:39 +0000 (14:40 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Tue, 27 Sep 2011 04:39:21 +0000 (14:39 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 04:38:03 +0000 (14:38 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Tue, 27 Sep 2011 04:35:07 +0000 (14:35 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 04:33:43 +0000 (14:33 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 04:27:26 +0000 (14:27 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Tue, 27 Sep 2011 04:23:18 +0000 (14:23 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/media/video/s5p-fimc/fimc-capture.c
drivers/net/Kconfig
Stephen Rothwell [Tue, 27 Sep 2011 04:11:00 +0000 (14:11 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 27 Sep 2011 04:09:35 +0000 (14:09 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 27 Sep 2011 04:09:23 +0000 (14:09 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 27 Sep 2011 04:08:39 +0000 (14:08 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Tue, 27 Sep 2011 04:02:07 +0000 (14:02 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Tue, 27 Sep 2011 04:00:43 +0000 (14:00 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:59:24 +0000 (13:59 +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 [Tue, 27 Sep 2011 03:48:15 +0000 (13:48 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:46:54 +0000 (13:46 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Tue, 27 Sep 2011 03:45:25 +0000 (13:45 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-u300/include/mach/irqs.h
Stephen Rothwell [Tue, 27 Sep 2011 03:23:10 +0000 (13:23 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:16:45 +0000 (13:16 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:16:36 +0000 (13:16 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:15:15 +0000 (13:15 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
Stephen Rothwell [Tue, 27 Sep 2011 03:15:04 +0000 (13:15 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Tue, 27 Sep 2011 03:13:13 +0000 (13:13 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 27 Sep 2011 03:11:41 +0000 (13:11 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 27 Sep 2011 03:09:33 +0000 (13:09 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:07:46 +0000 (13:07 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 27 Sep 2011 03:06:27 +0000 (13:06 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Tue, 27 Sep 2011 03:05:05 +0000 (13:05 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 27 Sep 2011 03:03:45 +0000 (13:03 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 03:01:42 +0000 (13:01 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Tue, 27 Sep 2011 02:56:10 +0000 (12:56 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:54:51 +0000 (12:54 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Tue, 27 Sep 2011 02:52:50 +0000 (12:52 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:51:12 +0000 (12:51 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Tue, 27 Sep 2011 02:45:16 +0000 (12:45 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Tue, 27 Sep 2011 02:34:40 +0000 (12:34 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:33 +0000 (12:32 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:29 +0000 (12:32 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:32:23 +0000 (12:32 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:31:06 +0000 (12:31 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:29:43 +0000 (12:29 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:28:26 +0000 (12:28 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 27 Sep 2011 02:28:21 +0000 (12:28 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:26:58 +0000 (12:26 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:25:15 +0000 (12:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:23:55 +0000 (12:23 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 27 Sep 2011 02:22:44 +0000 (12:22 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 27 Sep 2011 02:21:23 +0000 (12:21 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:20:12 +0000 (12:20 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 27 Sep 2011 02:18:54 +0000 (12:18 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 27 Sep 2011 02:17:42 +0000 (12:17 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 27 Sep 2011 02:16:23 +0000 (12:16 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:14:55 +0000 (12:14 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Tue, 27 Sep 2011 02:13:39 +0000 (12:13 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:12:10 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:06:11 +0000 (12:06 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 27 Sep 2011 02:04:58 +0000 (12:04 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:03:45 +0000 (12:03 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 27 Sep 2011 02:02:26 +0000 (12:02 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 27 Sep 2011 02:01:07 +0000 (12:01 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:59:56 +0000 (11:59 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:58:45 +0000 (11:58 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 27 Sep 2011 01:57:32 +0000 (11:57 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:56:21 +0000 (11:56 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 27 Sep 2011 01:55:10 +0000 (11:55 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 27 Sep 2011 01:48:51 +0000 (11:48 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 27 Sep 2011 01:47:34 +0000 (11:47 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 27 Sep 2011 01:41:16 +0000 (11:41 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 27 Sep 2011 01:39:57 +0000 (11:39 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:38:38 +0000 (11:38 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:37:25 +0000 (11:37 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:36:13 +0000 (11:36 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Tue, 27 Sep 2011 01:34:58 +0000 (11:34 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 27 Sep 2011 01:33:39 +0000 (11:33 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:32:28 +0000 (11:32 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:29:12 +0000 (11:29 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
drivers/gpio/Makefile
Stephen Rothwell [Tue, 27 Sep 2011 01:27:50 +0000 (11:27 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Tue, 27 Sep 2011 01:26:28 +0000 (11:26 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:25:15 +0000 (11:25 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/mm/dma-mapping.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Tue, 27 Sep 2011 01:05:28 +0000 (11:05 +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/mm/mmu.c
Stephen Rothwell [Tue, 27 Sep 2011 01:04:10 +0000 (11:04 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:34 +0000 (11:02 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:32 +0000 (11:02 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:31 +0000 (11:02 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 27 Sep 2011 01:02:29 +0000 (11:02 +1000)]
Merge remote-tracking branch 'scsi-rc-fixes/master'
Tushar Behera [Mon, 19 Sep 2011 11:09:01 +0000 (20:09 +0900)]
ARM: EXYNOS4: convert boot_params to atag_offset
Based on "ARM: introduce atag_offset to replace boot_params"
by Nicolas Pitre (
2bb9839e312ed55a6d5824ffa6077ce3d7d63b1e).
Since boot_params variable is deleted from machine_desc, the variable
is modified in the newer board files.
CC: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Heiko Stuebner [Mon, 26 Sep 2011 23:45:23 +0000 (08:45 +0900)]
ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
This clock is common to S3C2443/2416/2450.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Heiko Stuebner [Mon, 26 Sep 2011 23:45:09 +0000 (08:45 +0900)]
ARM: S3C2416: Add HSSPI clock sourced from EPLL
This clock is special to the S3C2416/2450 SoCs.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Heiko Stuebner [Mon, 26 Sep 2011 23:44:57 +0000 (08:44 +0900)]
ARM: S3C2443: Define constant for HSSPI pclk
It's the same clock for 2443/2416/2450.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Heiko Stuebner [Mon, 26 Sep 2011 23:44:37 +0000 (08:44 +0900)]
ARM: S3C2443: Move i2s clock definitions to common code
S3C2416/S3C2450 use the same clocks for their i2s blocks
and can therefore reuse the existing ones.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Jiri Kosina [Mon, 26 Sep 2011 23:33:45 +0000 (01:33 +0200)]
Merge branch 'upstream-fixes' into for-next
projects / karo-tx-linux.git / log