]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 16 Sep 2011 04:54:26 +0000 (14:54 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Fri, 16 Sep 2011 04:53:04 +0000 (14:53 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Fri, 16 Sep 2011 04:51:35 +0000 (14:51 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:50:17 +0000 (14:50 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:48:52 +0000 (14:48 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:43:27 +0000 (14:43 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Fri, 16 Sep 2011 04:37:34 +0000 (14:37 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Fri, 16 Sep 2011 04:36:10 +0000 (14:36 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:29:48 +0000 (14:29 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 16 Sep 2011 04:23:25 +0000 (14:23 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 16 Sep 2011 04:23:17 +0000 (14:23 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Fri, 16 Sep 2011 04:21:57 +0000 (14:21 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Fri, 16 Sep 2011 04:20:11 +0000 (14:20 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Fri, 16 Sep 2011 04:17:27 +0000 (14:17 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:16:07 +0000 (14:16 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:09:47 +0000 (14:09 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
Stephen Rothwell [Fri, 16 Sep 2011 04:08:22 +0000 (14:08 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:06:59 +0000 (14:06 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:05:39 +0000 (14:05 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 16 Sep 2011 04:04:13 +0000 (14:04 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 16 Sep 2011 04:03:32 +0000 (14:03 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Fri, 16 Sep 2011 04:00:57 +0000 (14:00 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Fri, 16 Sep 2011 03:59:33 +0000 (13:59 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:58:12 +0000 (13:58 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:56:49 +0000 (13:56 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:55:28 +0000 (13:55 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:53:43 +0000 (13:53 +1000)]
Merge commit 'refs/next/
20110915/mfd'
Conflicts:
drivers/rtc/rtc-twl.c
Stephen Rothwell [Fri, 16 Sep 2011 03:31:19 +0000 (13:31 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:25:02 +0000 (13:25 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:24:53 +0000 (13:24 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:23:32 +0000 (13:23 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:23:25 +0000 (13:23 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Fri, 16 Sep 2011 03:21:39 +0000 (13:21 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 16 Sep 2011 03:20:04 +0000 (13:20 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 16 Sep 2011 03:14:13 +0000 (13:14 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:12:29 +0000 (13:12 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 16 Sep 2011 03:11:10 +0000 (13:11 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Fri, 16 Sep 2011 03:09:53 +0000 (13:09 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 16 Sep 2011 03:08:33 +0000 (13:08 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:06:43 +0000 (13:06 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 03:01:26 +0000 (13:01 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 16 Sep 2011 03:00:07 +0000 (13:00 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Fri, 16 Sep 2011 02:56:57 +0000 (12:56 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:55:18 +0000 (12:55 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
Stephen Rothwell [Fri, 16 Sep 2011 02:49:46 +0000 (12:49 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Fri, 16 Sep 2011 02:42:43 +0000 (12:42 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 16 Sep 2011 02:40:37 +0000 (12:40 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:40:33 +0000 (12:40 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:40:27 +0000 (12:40 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:38:59 +0000 (12:38 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 16 Sep 2011 02:38:54 +0000 (12:38 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:37:31 +0000 (12:37 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:36:11 +0000 (12:36 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 16 Sep 2011 02:35:00 +0000 (12:35 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 16 Sep 2011 02:33:41 +0000 (12:33 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:32:30 +0000 (12:32 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 16 Sep 2011 02:31:13 +0000 (12:31 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 16 Sep 2011 02:30:01 +0000 (12:30 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 16 Sep 2011 02:28:41 +0000 (12:28 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:27:15 +0000 (12:27 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Fri, 16 Sep 2011 02:26:00 +0000 (12:26 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Conflicts:
net/9p/trans_virtio.c
Stephen Rothwell [Fri, 16 Sep 2011 02:24:34 +0000 (12:24 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:18:42 +0000 (12:18 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:17:30 +0000 (12:17 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:16:16 +0000 (12:16 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:14:57 +0000 (12:14 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 16 Sep 2011 02:13:42 +0000 (12:13 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:12:30 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:11:20 +0000 (12:11 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:10:09 +0000 (12:10 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 16 Sep 2011 02:08:55 +0000 (12:08 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 16 Sep 2011 02:07:42 +0000 (12:07 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 16 Sep 2011 02:06:31 +0000 (12:06 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 16 Sep 2011 02:05:14 +0000 (12:05 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 16 Sep 2011 02:03:58 +0000 (12:03 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 16 Sep 2011 02:02:47 +0000 (12:02 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 16 Sep 2011 02:01:28 +0000 (12:01 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 16 Sep 2011 02:00:09 +0000 (12:00 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 01:58:57 +0000 (11:58 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 01:57:45 +0000 (11:57 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Fri, 16 Sep 2011 01:56:29 +0000 (11:56 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 16 Sep 2011 01:55:13 +0000 (11:55 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 01:54:01 +0000 (11:54 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Fri, 16 Sep 2011 01:52:51 +0000 (11:52 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Fri, 16 Sep 2011 01:51:38 +0000 (11:51 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Fri, 16 Sep 2011 01:47:52 +0000 (11:47 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Fri, 16 Sep 2011 01:47:45 +0000 (11:47 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Fri, 16 Sep 2011 01:46:32 +0000 (11:46 +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 [Fri, 16 Sep 2011 01:40:37 +0000 (11:40 +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 [Fri, 16 Sep 2011 01:39:21 +0000 (11:39 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 16 Sep 2011 01:38:07 +0000 (11:38 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Fri, 16 Sep 2011 01:37:56 +0000 (11:37 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Fri, 16 Sep 2011 01:37:53 +0000 (11:37 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Fri, 16 Sep 2011 01:37:52 +0000 (11:37 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 16 Sep 2011 01:37:51 +0000 (11:37 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 16 Sep 2011 01:37:51 +0000 (11:37 +1000)]
Merge remote-tracking branch 'net-current/master'
Mark Brown [Thu, 15 Sep 2011 23:54:25 +0000 (00:54 +0100)]
Merge branch 'for-3.1' into for-3.2
Mark Brown [Thu, 15 Sep 2011 09:52:11 +0000 (10:52 +0100)]
ASoC: Fix WM8996 DC servo operation without IRQ
We need to count the timeout down.
Reported-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Axel Lin [Thu, 15 Sep 2011 03:04:56 +0000 (11:04 +0800)]
ASoC: bf5xx-
ad73311: Fix prototype for bf5xx_probe
Fix below build warning:
sound/soc/blackfin/bf5xx-
ad73311.c: warning: initialization from incompatible pointer type
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Axel Lin [Thu, 15 Sep 2011 02:36:54 +0000 (10:36 +0800)]
ASoC: samsung: Fix checking return value of clk_get
clk_get() returns a pointer to the struct clk or an ERR_PTR().
This patch also use PTR_ERR() for return value.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
projects / karo-tx-linux.git / log