]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 6 Sep 2012 03:47:28 +0000 (13:47 +1000)]
Merge commit 'refs/next/
20120905 /spi-mb'
Conflicts:
drivers/mmc/host/mxs-mmc.c
Stephen Rothwell [Thu, 6 Sep 2012 03:40:00 +0000 (13:40 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:39:53 +0000 (13:39 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Thu, 6 Sep 2012 03:39:38 +0000 (13:39 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 6 Sep 2012 03:38:02 +0000 (13:38 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Thu, 6 Sep 2012 03:36:06 +0000 (13:36 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:29:08 +0000 (13:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:22:52 +0000 (13:22 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
Stephen Rothwell [Thu, 6 Sep 2012 03:16:49 +0000 (13:16 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:15:12 +0000 (13:15 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 6 Sep 2012 03:15:02 +0000 (13:15 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 6 Sep 2012 03:12:02 +0000 (13:12 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 6 Sep 2012 03:10:26 +0000 (13:10 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:08:45 +0000 (13:08 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:07:04 +0000 (13:07 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 6 Sep 2012 03:05:30 +0000 (13:05 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:03:55 +0000 (13:03 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:02:18 +0000 (13:02 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 03:00:38 +0000 (13:00 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:59:01 +0000 (12:59 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:57:14 +0000 (12:57 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 6 Sep 2012 02:57:09 +0000 (12:57 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:55:30 +0000 (12:55 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 6 Sep 2012 02:50:21 +0000 (12:50 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Thu, 6 Sep 2012 02:48:37 +0000 (12:48 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:46:53 +0000 (12:46 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:45:11 +0000 (12:45 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:43:34 +0000 (12:43 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 6 Sep 2012 02:42:00 +0000 (12:42 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 6 Sep 2012 02:40:26 +0000 (12:40 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 6 Sep 2012 02:38:49 +0000 (12:38 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 6 Sep 2012 02:31:30 +0000 (12:31 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/socket.c
Stephen Rothwell [Thu, 6 Sep 2012 02:29:50 +0000 (12:29 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 6 Sep 2012 02:28:15 +0000 (12:28 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Thu, 6 Sep 2012 02:26:36 +0000 (12:26 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:24:58 +0000 (12:24 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:23:25 +0000 (12:23 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 6 Sep 2012 02:21:50 +0000 (12:21 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:20:14 +0000 (12:20 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 6 Sep 2012 02:20:07 +0000 (12:20 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Thu, 6 Sep 2012 02:18:23 +0000 (12:18 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 6 Sep 2012 02:16:50 +0000 (12:16 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 6 Sep 2012 02:15:17 +0000 (12:15 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:13:35 +0000 (12:13 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:11:41 +0000 (12:11 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Thu, 6 Sep 2012 02:04:36 +0000 (12:04 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:03:13 +0000 (12:03 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 6 Sep 2012 02:01:49 +0000 (12:01 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 02:00:18 +0000 (12:00 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Thu, 6 Sep 2012 01:58:52 +0000 (11:58 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:55:35 +0000 (11:55 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/rapidio/devices/tsi721.c
Stephen Rothwell [Thu, 6 Sep 2012 01:51:15 +0000 (11:51 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:49:41 +0000 (11:49 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:48:12 +0000 (11:48 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:46:36 +0000 (11:46 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:45:06 +0000 (11:45 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:43:38 +0000 (11:43 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 6 Sep 2012 01:42:12 +0000 (11:42 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 6 Sep 2012 01:40:38 +0000 (11:40 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:39:12 +0000 (11:39 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 6 Sep 2012 01:37:44 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 6 Sep 2012 01:36:13 +0000 (11:36 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 6 Sep 2012 01:34:49 +0000 (11:34 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 6 Sep 2012 01:33:22 +0000 (11:33 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Thu, 6 Sep 2012 01:31:59 +0000 (11:31 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 6 Sep 2012 01:26:55 +0000 (11:26 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 6 Sep 2012 01:24:29 +0000 (11:24 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Thu, 6 Sep 2012 01:23:05 +0000 (11:23 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 6 Sep 2012 01:20:37 +0000 (11:20 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 6 Sep 2012 01:19:06 +0000 (11:19 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 6 Sep 2012 01:17:39 +0000 (11:17 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:16:12 +0000 (11:16 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:14:46 +0000 (11:14 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:13:15 +0000 (11:13 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:11:48 +0000 (11:11 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 6 Sep 2012 01:10:21 +0000 (11:10 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
Stephen Rothwell [Thu, 6 Sep 2012 01:08:50 +0000 (11:08 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:58 +0000 (11:01 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:54 +0000 (11:01 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:42 +0000 (11:01 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:41 +0000 (11:01 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:40 +0000 (11:01 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:39 +0000 (11:01 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:37 +0000 (11:01 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:36 +0000 (11:01 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:35 +0000 (11:01 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:34 +0000 (11:01 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:33 +0000 (11:01 +1000)]
Merge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:32 +0000 (11:01 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:31 +0000 (11:01 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Thu, 6 Sep 2012 01:01:29 +0000 (11:01 +1000)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'
Mark Brown [Thu, 6 Sep 2012 00:28:34 +0000 (08:28 +0800)]
Merge branch 'for-3.7' into asoc-next
Mark Brown [Sat, 1 Sep 2012 00:38:32 +0000 (17:38 -0700)]
ASoC: dapm: Ensure bypass paths are suspended and resumed
Since bypass paths aren't part of DAPM streams and we may not have any
DAPM streams there may not be anything that triggers a DAPM sync for
them. Mark all input and output widgets as dirty and then sync to do so
at the end of suspend and resume.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Hebbar, Gururaja [Mon, 3 Sep 2012 08:10:40 +0000 (13:40 +0530)]
ASoC: Davinci: McASP: add support new McASP IP Variant
The OMAP2+ variant of McASP is different from Davinci variant w.r.to
some register offset.
Changes
- Add new MCASP_VERSION_3 to identify new variant. New DT compatible
"ti,omap2-mcasp-audio" to identify version 3 controller.
- The register offsets are handled depending on the version.
Note:
DMA parameters (dma fifo offset) are not updated and will be done later.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Wei Yongjun [Wed, 5 Sep 2012 06:42:48 +0000 (14:42 +0800)]
target: use list_move_tail instead of list_del/list_add_tail
Using list_move_tail() instead of list_del() + list_add_tail().
spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Lars-Peter Clausen [Mon, 3 Sep 2012 08:34:26 +0000 (10:34 +0200)]
ASoC: Remove unused 'saved_value' field from snd_soc_dapm_widget struct
The only user was removed over two years ago in commit
a6c65736 ("ASoC: Remove
current PGA control handling").
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Roland Dreier [Thu, 30 Aug 2012 23:28:30 +0000 (16:28 -0700)]
target/iscsi: Don't log "iSCSI Login negotiation failed." twice
There's no need for iscsi_target_init_negotiation() to print
iSCSI Login negotiation failed.
on failure, since its only caller (__iscsi_target_login_thread())
prints exactly the same message if it gets an error return back.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Alan Stern [Tue, 4 Sep 2012 14:41:02 +0000 (10:41 -0400)]
USB: add device quirk for Joss Optical touchboard
This patch (as1604) adds a CONFIG_INTF_STRINGS quirk for the Joss
infrared touchboard device. The device doesn't like to be asked for
its interface strings.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: adam ? <adam3337@wp.pl>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nicolas Ferre [Wed, 29 Aug 2012 09:49:18 +0000 (11:49 +0200)]
USB: ohci-at91: fix PIO handling in relation with number of ports
If the number of ports present on the SoC/board is not the maximum
and that the platform data is not filled with all data, there is
an easy way to mess the PIO setup for this interface.
This quick fix addresses mis-configuration in USB host platform data
that is common in at91 boards since commit
0ee6d1e (USB: ohci-at91:
change maximum number of ports) that did not modified the associatd
board files.
Reported-by: Klaus Falkner <klaus.falkner@solectrix.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Stable <stable@vger.kernel.org> [3.4+]
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Horst Schirmeier [Thu, 30 Aug 2012 22:00:28 +0000 (00:00 +0200)]
USB: ftdi_sio: PID for NZR SEM 16+ USB
This adds the USB PID for the NZR SEM 16+ USB energy monitor device
<http://www.nzr.de>. It works perfectly with the GPL software on
<http://schou.dk/linux/sparometer/>.
Signed-off-by: Horst Schirmeier <horst@schirmeier.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>