]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoAdd linux-next specific files for 20131204 next-20131204
Stephen Rothwell [Wed, 4 Dec 2013 02:55:47 +0000 (13:55 +1100)]
Add linux-next specific files for 20131204

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
10 years agoMerge branch 'akpm/master'
Stephen Rothwell [Wed, 4 Dec 2013 02:29:56 +0000 (13:29 +1100)]
Merge branch 'akpm/master'

10 years agomm: add strictlimit knob
Maxim Patlasov [Sat, 23 Nov 2013 05:05:43 +0000 (16:05 +1100)]
mm: add strictlimit knob

The "strictlimit" feature was introduced to enforce per-bdi dirty limits
for FUSE which sets bdi max_ratio to 1% by default:

http://article.gmane.org/gmane.linux.kernel.mm/105809

However the feature can be useful for other relatively slow or untrusted
BDIs like USB flash drives and DVD+RW.  The patch adds a knob to enable
the feature:

echo 1 > /sys/class/bdi/X:Y/strictlimit

Being enabled, the feature enforces bdi max_ratio limit even if global
(10%) dirty limit is not reached.  Of course, the effect is not visible
until /sys/class/bdi/X:Y/max_ratio is decreased to some reasonable value.

Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Artem S. Tashkinov" <t.artem@lycos.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jan Kara <jack@suse.cz>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Wed, 4 Dec 2013 02:19:17 +0000 (13:19 +1100)]
Merge branch 'akpm-current/current'

Conflicts:
arch/um/kernel/sysrq.c

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 4 Dec 2013 02:16:34 +0000 (13:16 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:15:27 +0000 (13:15 +1100)]
Merge remote-tracking branch 'clk/clk-next'

10 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:14:34 +0000 (13:14 +1100)]
Merge remote-tracking branch 'ktest/for-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:13:23 +0000 (13:13 +1100)]
Merge remote-tracking branch 'userns/for-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:11:47 +0000 (13:11 +1100)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:10:38 +0000 (13:10 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:08:45 +0000 (13:08 +1100)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:07:56 +0000 (13:07 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 4 Dec 2013 02:06:20 +0000 (13:06 +1100)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
include/linux/hid-sensor-ids.h

10 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Wed, 4 Dec 2013 01:38:17 +0000 (12:38 +1100)]
Merge remote-tracking branch 'usb-gadget/next'

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:37:03 +0000 (12:37 +1100)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:26:56 +0000 (12:26 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:26:09 +0000 (12:26 +1100)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:25:01 +0000 (12:25 +1100)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:24:11 +0000 (12:24 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:24:05 +0000 (12:24 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:23:09 +0000 (12:23 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:22:20 +0000 (12:22 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:21:27 +0000 (12:21 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 4 Dec 2013 01:11:10 +0000 (12:11 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:09:58 +0000 (12:09 +1100)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Wed, 4 Dec 2013 01:09:51 +0000 (12:09 +1100)]
Merge remote-tracking branch 'audit/master'

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 01:01:48 +0000 (12:01 +1100)]
Merge remote-tracking branch 'trivial/for-next'

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 4 Dec 2013 01:01:36 +0000 (12:01 +1100)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 4 Dec 2013 01:00:45 +0000 (12:00 +1100)]
Merge remote-tracking branch 'watchdog/master'

Conflicts:
drivers/watchdog/rt2880_wdt.c

10 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 4 Dec 2013 01:00:40 +0000 (12:00 +1100)]
Merge remote-tracking branch 'selinux/master'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:59:34 +0000 (11:59 +1100)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:58:15 +0000 (11:58 +1100)]
Merge remote-tracking branch 'battery/master'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:57:02 +0000 (11:57 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:56:55 +0000 (11:56 +1100)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:56:52 +0000 (11:56 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

Conflicts:
kernel/debug/debug_core.h

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:55:41 +0000 (11:55 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:46:54 +0000 (11:46 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:41:22 +0000 (11:41 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:40:32 +0000 (11:40 +1100)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:39:21 +0000 (11:39 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:38:32 +0000 (11:38 +1100)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:37:15 +0000 (11:37 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

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

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:36:19 +0000 (11:36 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:35:27 +0000 (11:35 +1100)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:33:41 +0000 (11:33 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:32:45 +0000 (11:32 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:31:45 +0000 (11:31 +1100)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:29:42 +0000 (11:29 +1100)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:28:43 +0000 (11:28 +1100)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:27:47 +0000 (11:27 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:26:52 +0000 (11:26 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:26:04 +0000 (11:26 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:25:17 +0000 (11:25 +1100)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:24:15 +0000 (11:24 +1100)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:23:21 +0000 (11:23 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

10 years agoMerge remote-tracking branch 'squashfs/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:22:32 +0000 (11:22 +1100)]
Merge remote-tracking branch 'squashfs/master'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:21:07 +0000 (11:21 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:19:47 +0000 (11:19 +1100)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:18:56 +0000 (11:18 +1100)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 4 Dec 2013 00:18:07 +0000 (11:18 +1100)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 4 Dec 2013 00:17:18 +0000 (11:17 +1100)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 4 Dec 2013 00:16:20 +0000 (11:16 +1100)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 4 Dec 2013 00:15:26 +0000 (11:15 +1100)]
Merge remote-tracking branch 'ext3/for_next'

10 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:14:32 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ceph/master'

10 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 4 Dec 2013 00:13:42 +0000 (11:13 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 4 Dec 2013 00:12:52 +0000 (11:12 +1100)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 4 Dec 2013 00:12:00 +0000 (11:12 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 4 Dec 2013 00:11:08 +0000 (11:11 +1100)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:10:19 +0000 (11:10 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:08:03 +0000 (11:08 +1100)]
Merge remote-tracking branch 'powerpc/next'

10 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:07:15 +0000 (11:07 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'

10 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 4 Dec 2013 00:06:25 +0000 (11:06 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:05:37 +0000 (11:05 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 4 Dec 2013 00:04:49 +0000 (11:04 +1100)]
Merge remote-tracking branch 'microblaze/next'

10 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:04:01 +0000 (11:04 +1100)]
Merge remote-tracking branch 'metag/for-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:03:13 +0000 (11:03 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:02:23 +0000 (11:02 +1100)]
Merge remote-tracking branch 'm68k/for-next'

10 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:01:31 +0000 (11:01 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 4 Dec 2013 00:00:39 +0000 (11:00 +1100)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 3 Dec 2013 23:59:51 +0000 (10:59 +1100)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:59:00 +0000 (10:59 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:58:04 +0000 (10:58 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:58:00 +0000 (10:58 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'cortex-m/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:57:58 +0000 (10:57 +1100)]
Merge remote-tracking branch 'cortex-m/for-next'

10 years agoMerge remote-tracking branch 'arm-v7-cache-opt/v7-cache-opt'
Stephen Rothwell [Tue, 3 Dec 2013 23:57:09 +0000 (10:57 +1100)]
Merge remote-tracking branch 'arm-v7-cache-opt/v7-cache-opt'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:56:20 +0000 (10:56 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:55:07 +0000 (10:55 +1100)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 3 Dec 2013 23:54:08 +0000 (10:54 +1100)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:59 +0000 (10:43 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

10 years agoMerge remote-tracking branch 'mfd-fixes/master'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:58 +0000 (10:43 +1100)]
Merge remote-tracking branch 'mfd-fixes/master'

10 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:54 +0000 (10:43 +1100)]
Merge remote-tracking branch 'crypto-current/master'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:52 +0000 (10:43 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:52 +0000 (10:43 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

10 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:51 +0000 (10:43 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'

10 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:50 +0000 (10:43 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

10 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:50 +0000 (10:43 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

10 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:49 +0000 (10:43 +1100)]
Merge remote-tracking branch 'wireless/master'

10 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:48 +0000 (10:43 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:47 +0000 (10:43 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 3 Dec 2013 23:43:46 +0000 (10:43 +1100)]
Merge remote-tracking branch 'net/master'