]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoia64: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
ia64: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarm: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
arm: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomm/page_io.c: work around gcc bug
Andrew Morton [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
mm/page_io.c: work around gcc bug

gcc-4.4.4 (at least) screws up this initialization.

mm/page_io.c: In function '__swap_writepage':
mm/page_io.c:277: error: unknown field 'bvec' specified in initializer
mm/page_io.c:278: warning: excess elements in struct initializer
mm/page_io.c:278: warning: (near initialization for 'from')

Fixes f990bbc9bfa3cbd2d ("bio_vec-backed iov_iter").

Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/gpio/gpio-zevio.c: fix build
Andrew Morton [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
drivers/gpio/gpio-zevio.c: fix build

Unbreak i386 allmodconfig.

This is a hack - please fix properly ;)

Cc: Fabian Vogt <fabian@ritter-vogt.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Tue, 29 Apr 2014 06:14:16 +0000 (16:14 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
arch/x86/kernel/apic/hw_nmi.c
mm/vmacache.c

10 years agoMerge branch 'rd-docs/master'
Stephen Rothwell [Tue, 29 Apr 2014 03:34:22 +0000 (13:34 +1000)]
Merge branch 'rd-docs/master'

10 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:32:53 +0000 (13:32 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'

10 years agoMerge remote-tracking branch 'aio/master'
Stephen Rothwell [Tue, 29 Apr 2014 03:31:36 +0000 (13:31 +1000)]
Merge remote-tracking branch 'aio/master'

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Tue, 29 Apr 2014 03:30:06 +0000 (13:30 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:29:08 +0000 (13:29 +1000)]
Merge remote-tracking branch 'clk/clk-next'

10 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:28:15 +0000 (13:28 +1000)]
Merge remote-tracking branch 'ktest/for-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:18:49 +0000 (13:18 +1000)]
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c

10 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:17:49 +0000 (13:17 +1000)]
Merge remote-tracking branch 'pwm/for-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:16:18 +0000 (13:16 +1000)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:15:02 +0000 (13:15 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:14:51 +0000 (13:14 +1000)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:08:53 +0000 (13:08 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 29 Apr 2014 03:07:08 +0000 (13:07 +1000)]
Merge remote-tracking branch 'staging/staging-next'

10 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Tue, 29 Apr 2014 03:06:15 +0000 (13:06 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:54:43 +0000 (12:54 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:53:03 +0000 (12:53 +1000)]
Merge remote-tracking branch 'tty/tty-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:42:09 +0000 (12:42 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:41:17 +0000 (12:41 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:39:53 +0000 (12:39 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:39:46 +0000 (12:39 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:38:28 +0000 (12:38 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:27:29 +0000 (12:27 +1000)]
Merge remote-tracking branch 'percpu/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:26:36 +0000 (12:26 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:25:25 +0000 (12:25 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 29 Apr 2014 02:14:26 +0000 (12:14 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:12:35 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:12:33 +0000 (12:12 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 29 Apr 2014 02:01:31 +0000 (12:01 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 02:00:20 +0000 (12:00 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:58:34 +0000 (11:58 +1000)]
Merge remote-tracking branch 'audit/master'

Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 29 Apr 2014 01:57:27 +0000 (11:57 +1000)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 29 Apr 2014 01:57:20 +0000 (11:57 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 29 Apr 2014 01:47:34 +0000 (11:47 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:46:16 +0000 (11:46 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:39:25 +0000 (11:39 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:38:11 +0000 (11:38 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:36:42 +0000 (11:36 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:33:50 +0000 (11:33 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 29 Apr 2014 01:32:51 +0000 (11:32 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:31:47 +0000 (11:31 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:23:36 +0000 (11:23 +1000)]
Merge remote-tracking branch 'modules/modules-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:22:32 +0000 (11:22 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:21:29 +0000 (11:21 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:20:32 +0000 (11:20 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:18:58 +0000 (11:18 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

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

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 01:18:52 +0000 (11:18 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:17:51 +0000 (11:17 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:15:41 +0000 (11:15 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:14:22 +0000 (11:14 +1000)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:13:18 +0000 (11:13 +1000)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:11:51 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 29 Apr 2014 01:01:30 +0000 (11:01 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:56:05 +0000 (10:56 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:55:10 +0000 (10:55 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:53:25 +0000 (10:53 +1000)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:52:32 +0000 (10:52 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:51:14 +0000 (10:51 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 29 Apr 2014 00:50:21 +0000 (10:50 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:49:29 +0000 (10:49 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:47:33 +0000 (10:47 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:37:01 +0000 (10:37 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/f2fs/file.c

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:26:57 +0000 (10:26 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:25:45 +0000 (10:25 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 29 Apr 2014 00:24:10 +0000 (10:24 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:23:18 +0000 (10:23 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 29 Apr 2014 00:22:26 +0000 (10:22 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:21:30 +0000 (10:21 +1000)]
Merge remote-tracking branch 'fuse/for-next'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 29 Apr 2014 00:21:26 +0000 (10:21 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 29 Apr 2014 00:20:34 +0000 (10:20 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 29 Apr 2014 00:19:26 +0000 (10:19 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:18:30 +0000 (10:18 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:17:35 +0000 (10:17 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 29 Apr 2014 00:16:39 +0000 (10:16 +1000)]
Merge remote-tracking branch 'xtensa/for_next'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:15:42 +0000 (10:15 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 29 Apr 2014 00:14:16 +0000 (10:14 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:13:14 +0000 (10:13 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:12:18 +0000 (10:12 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:11:14 +0000 (10:11 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:10:21 +0000 (10:10 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:09:28 +0000 (10:09 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:08:23 +0000 (10:08 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/board-v7.c

10 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 29 Apr 2014 00:08:16 +0000 (10:08 +1000)]
Merge remote-tracking branch 'keystone/next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:07:15 +0000 (10:07 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:07:07 +0000 (10:07 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:06:15 +0000 (10:06 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

10 years agoMerge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Tue, 29 Apr 2014 00:05:19 +0000 (10:05 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:03:15 +0000 (10:03 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 29 Apr 2014 00:02:25 +0000 (10:02 +1000)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:19 +0000 (09:57 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

10 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:16 +0000 (09:57 +1000)]
Merge remote-tracking branch 'rr-fixes/fixes'

10 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:13 +0000 (09:57 +1000)]
Merge remote-tracking branch 'ide/master'

10 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:11 +0000 (09:57 +1000)]
Merge remote-tracking branch 'crypto-current/master'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:08 +0000 (09:57 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:06 +0000 (09:57 +1000)]
Merge remote-tracking branch 'wireless/master'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Mon, 28 Apr 2014 23:57:05 +0000 (09:57 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'