]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 05:26:48 +0000 (16:26 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
drivers/s390/kvm/virtio_ccw.c

11 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 2 Apr 2013 05:19:13 +0000 (16:19 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'

11 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 05:11:43 +0000 (16:11 +1100)]
Merge remote-tracking branch 'ftrace/for-next'

Conflicts:
kernel/trace/ftrace.c

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 2 Apr 2013 05:04:39 +0000 (16:04 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Tue, 2 Apr 2013 05:02:53 +0000 (16:02 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:55:03 +0000 (15:55 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/virtual/virtio-spec.txt

11 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Tue, 2 Apr 2013 04:28:43 +0000 (15:28 +1100)]
Merge remote-tracking branch 'vfio/next'

11 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 2 Apr 2013 04:27:13 +0000 (15:27 +1100)]
Merge remote-tracking branch 'iommu/next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 2 Apr 2013 04:25:39 +0000 (15:25 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 2 Apr 2013 04:25:32 +0000 (15:25 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 2 Apr 2013 04:20:48 +0000 (15:20 +1100)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:19:15 +0000 (15:19 +1100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:17:45 +0000 (15:17 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 2 Apr 2013 04:16:09 +0000 (15:16 +1100)]
Merge remote-tracking branch 'battery/master'

11 years agoMerge remote-tracking branch 'mfd/master'
Stephen Rothwell [Tue, 2 Apr 2013 04:14:39 +0000 (15:14 +1100)]
Merge remote-tracking branch 'mfd/master'

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:13:07 +0000 (15:13 +1100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:05:53 +0000 (15:05 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:05:49 +0000 (15:05 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 2 Apr 2013 04:04:18 +0000 (15:04 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Tue, 2 Apr 2013 04:02:36 +0000 (15:02 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 03:34:22 +0000 (14:34 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/md/raid5.c

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 03:30:01 +0000 (14:30 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
include/linux/res_counter.h

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 2 Apr 2013 03:23:05 +0000 (14:23 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 2 Apr 2013 03:17:37 +0000 (14:17 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

Conflicts:
drivers/char/virtio_console.c

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 2 Apr 2013 02:57:25 +0000 (13:57 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 02:55:54 +0000 (13:55 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 02:54:08 +0000 (13:54 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Tue, 2 Apr 2013 02:46:46 +0000 (13:46 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

Conflicts:
drivers/gpu/drm/i915/intel_dp.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:36:27 +0000 (13:36 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:34:55 +0000 (13:34 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:33:23 +0000 (13:33 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years ago20130328/wireless-next
Stephen Rothwell [Tue, 2 Apr 2013 02:31:34 +0000 (13:31 +1100)]
20130328/wireless-next

Conflicts:
net/mac80211/sta_info.c

11 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:05:13 +0000 (13:05 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 2 Apr 2013 02:00:34 +0000 (13:00 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/nfc/microread/mei.c

11 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 2 Apr 2013 01:57:15 +0000 (12:57 +1100)]
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c

11 years ago20130328/slave-dma
Stephen Rothwell [Tue, 2 Apr 2013 01:35:53 +0000 (12:35 +1100)]
20130328/slave-dma

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 01:15:47 +0000 (12:15 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 2 Apr 2013 01:14:02 +0000 (12:14 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Tue, 2 Apr 2013 01:13:53 +0000 (12:13 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/base/power/qos.c

11 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Tue, 2 Apr 2013 00:49:43 +0000 (11:49 +1100)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:47:50 +0000 (11:47 +1100)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'pstore/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:46:22 +0000 (11:46 +1100)]
Merge remote-tracking branch 'pstore/master'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:44:37 +0000 (11:44 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:42:46 +0000 (11:42 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/platform/Kconfig

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:41:20 +0000 (11:41 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:39:56 +0000 (11:39 +1100)]
Merge branch 'jdelvare-hwmon/master'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:37:40 +0000 (11:37 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:36:10 +0000 (11:36 +1100)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 2 Apr 2013 00:32:53 +0000 (11:32 +1100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:11:14 +0000 (11:11 +1100)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_iomap.c

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:09:50 +0000 (11:09 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:07:56 +0000 (11:07 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:06:23 +0000 (11:06 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:04:43 +0000 (11:04 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 2 Apr 2013 00:03:19 +0000 (11:03 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 2 Apr 2013 00:01:56 +0000 (11:01 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 2 Apr 2013 00:00:33 +0000 (11:00 +1100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 1 Apr 2013 23:59:02 +0000 (10:59 +1100)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 1 Apr 2013 23:57:39 +0000 (10:57 +1100)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:56:10 +0000 (10:56 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:56:08 +0000 (10:56 +1100)]
Merge remote-tracking branch 'btrfs/next'

11 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:54:44 +0000 (10:54 +1100)]
Merge remote-tracking branch 'tile/master'

11 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:53:22 +0000 (10:53 +1100)]
Merge remote-tracking branch 'sparc-next/master'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 1 Apr 2013 23:51:59 +0000 (10:51 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 1 Apr 2013 23:50:36 +0000 (10:50 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:48:08 +0000 (10:48 +1100)]
Merge remote-tracking branch 'galak/next'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:46:46 +0000 (10:46 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:39:54 +0000 (10:39 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:38:30 +0000 (10:38 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:33:10 +0000 (10:33 +1100)]
Merge remote-tracking branch 'metag/for-next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:31:48 +0000 (10:31 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 1 Apr 2013 23:30:25 +0000 (10:30 +1100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'hexagon/linux-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:29:03 +0000 (10:29 +1100)]
Merge remote-tracking branch 'hexagon/linux-next'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Mon, 1 Apr 2013 23:27:38 +0000 (10:27 +1100)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:26:12 +0000 (10:26 +1100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Mon, 1 Apr 2013 23:24:50 +0000 (10:24 +1100)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'vfio-fixes/for-linus'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:23 +0000 (10:23 +1100)]
Merge remote-tracking branch 'vfio-fixes/for-linus'

11 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:22 +0000 (10:23 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'

11 years agoMerge remote-tracking branch 'dwmw2/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:14 +0000 (10:23 +1100)]
Merge remote-tracking branch 'dwmw2/master'

11 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:13 +0000 (10:23 +1100)]
Merge remote-tracking branch 'ide/master'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:06 +0000 (10:23 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:04 +0000 (10:23 +1100)]
Merge remote-tracking branch 'sparc/master'

11 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Mon, 1 Apr 2013 23:23:02 +0000 (10:23 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

11 years agoloop: prevent bdev freeing while device in use
Anatol Pomozov [Mon, 1 Apr 2013 16:47:56 +0000 (09:47 -0700)]
loop: prevent bdev freeing while device in use

struct block_device lifecycle is defined by its inode (see fs/block_dev.c) -
block_device allocated first time we access /dev/loopXX and deallocated on
bdev_destroy_inode. When we create the device "losetup /dev/loopXX afile"
we want that block_device stay alive until we destroy the loop device
with "losetup -d".

But because we do not hold /dev/loopXX inode its counter goes 0, and
inode/bdev can be destroyed at any moment. Usually it happens at memory
pressure or when user drops inode cache (like in the test below). When later in
loop_clr_fd() we want to use bdev we have use-after-free error with following
stack:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000280
  bd_set_size+0x10/0xa0
  loop_clr_fd+0x1f8/0x420 [loop]
  lo_ioctl+0x200/0x7e0 [loop]
  lo_compat_ioctl+0x47/0xe0 [loop]
  compat_blkdev_ioctl+0x341/0x1290
  do_filp_open+0x42/0xa0
  compat_sys_ioctl+0xc1/0xf20
  do_sys_open+0x16e/0x1d0
  sysenter_dispatch+0x7/0x1a

To prevent use-after-free we need to grab the device in loop_set_fd()
and put it later in loop_clr_fd().

The issue is reprodusible on current Linus head and v3.3. Here is the test:

  dd if=/dev/zero of=loop.file bs=1M count=1
  while [ true ]; do
    losetup /dev/loop0 loop.file
    echo 2 > /proc/sys/vm/drop_caches
    losetup -d /dev/loop0
  done

[ Doing bdgrab/bput in loop_set_fd/loop_clr_fd is safe, because every
  time we call loop_set_fd() we check that loop_device->lo_state is
  Lo_unbound and set it to Lo_bound If somebody will try to set_fd again
  it will get EBUSY.  And if we try to loop_clr_fd() on unbound loop
  device we'll get ENXIO.

  loop_set_fd/loop_clr_fd (and any other loop ioctl) is called under
  loop_device->lo_ctl_mutex. ]

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Linus Torvalds [Mon, 1 Apr 2013 22:06:34 +0000 (15:06 -0700)]
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull tegra clock driver fix from Mike Turquette:
 "Missing base address in Tegra clock driver results in non-operational
  PCIe.  On some devices this means that Ethernet will go uninitialized
  and other devices will fail.  This pull request fixes it with a single
  patch to pass the proper base address in the Tegra clock driver."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: tegra: Allow PLLE training to succeed

11 years agoMerge tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe
Linus Torvalds [Mon, 1 Apr 2013 22:06:00 +0000 (15:06 -0700)]
Merge tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe

Pull FCoE fixes from Robert Love:
 "Critical patches to fix FCoE VN2VN mode with new interfaces targeting
  3.9-rc"

* tag 'for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe:
  libfcoe: Fix fcoe_sysfs VN2VN mode
  libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}
  libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization
  fcoe: Fix deadlock between create and destroy paths
  bnx2fc: Make the fcoe_cltr the SCSI host parent

11 years agoMerge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:43 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:40 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/wm8903' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:38 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/wm2000' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:37 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:36 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:36 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:34 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:31 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/spear' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:30 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:29 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:28 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/omap' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:25 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/max98090' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:22 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/max98088' into asoc-next
Mark Brown [Mon, 1 Apr 2013 21:23:21 +0000 (22:23 +0100)]
Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next