]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agorapidio: make enumeration/discovery configurable
Alexandre Bounine [Thu, 9 May 2013 23:56:57 +0000 (09:56 +1000)]
rapidio: make enumeration/discovery configurable

Systems that use RapidIO fabric may need to implement their own
enumeration and discovery methods which are better suitable for needs of a
target application.

The following set of patches is intended to simplify process of
introduction of new RapidIO fabric enumeration/discovery methods.

The first patch offers ability to add new RapidIO enumeration/discovery
methods using kernel configuration options.  This new configuration option
mechanism allows to select statically linked or modular
enumeration/discovery method(s) from the list of existing methods or use
external module(s).

This patch also updates the currently existing enumeration/discovery code
to be used as a statically linked or modular method.  The corresponding
configuration option is named "Basic enumeration/discovery" method.  This
is the only one configuration option available today but new methods are
expected to be introduced after adoption of provided patches.

The second patch address a long time complaint of RapidIO subsystem users
regarding fabric enumeration/discovery start sequence.  Existing
implementation offers only a boot-time enumeration/discovery start which
requires synchronized boot of all endpoints in RapidIO network.  While it
works for small closed configurations with limited number of endpoints,
using this approach in systems with large number of endpoints is quite
challenging.

To eliminate requirement for synchronized start the second patch
introduces RapidIO enumeration/discovery start from user space.

For compatibility with the existing RapidIO subsystem implementation,
automatic boot time enumeration/discovery start can be configured in by
specifying "rio-scan.scan=1" command line parameter if statically linked
basic enumeration method is selected.

This patch:

Rework to implement RapidIO enumeration/discovery method selection
combined with ability to use enumeration/discovery as a kernel module.

This patch adds ability to introduce new RapidIO enumeration/discovery
methods using kernel configuration options.  Configuration option
mechanism allows to select statically linked or modular
enumeration/discovery method from the list of existing methods or use
external modules.  If a modular enumeration/discovery is selected each
RapidIO mport device can have its own method attached to it.

The existing enumeration/discovery code was updated to be used as
statically linked or modular method.  This configuration option is named
"Basic enumeration/discovery" method.

Several common routines have been moved from rio-scan.c to make them
available to other enumeration methods and reduce number of exported
symbols.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Andre van Herk <andre.van.herk@Prodrive.nl>
Cc: Micha Nelissen <micha.nelissen@Prodrive.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agodrivers/block/xsysace.c: fix id with missing port-number
Gernot Vormayr [Thu, 9 May 2013 23:56:57 +0000 (09:56 +1000)]
drivers/block/xsysace.c: fix id with missing port-number

If the port number is missing from the device-tree the device gets named
xs` instead of xsa.  This fixes the check for missing ids.

Tested on ml507 board.

Signed-off-by: Gernot Vormayr <gvormayr@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Tue, 21 May 2013 04:10:28 +0000 (14:10 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

11 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Tue, 21 May 2013 04:08:50 +0000 (14:08 +1000)]
Merge remote-tracking branch 'clk/clk-next'

11 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Tue, 21 May 2013 04:07:09 +0000 (14:07 +1000)]
Merge remote-tracking branch 'userns/for-next'

11 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 21 May 2013 04:05:31 +0000 (14:05 +1000)]
Merge remote-tracking branch 'pwm/for-next'

11 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 21 May 2013 04:03:53 +0000 (14:03 +1000)]
Merge remote-tracking branch 'tegra/for-next'

11 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 21 May 2013 04:02:16 +0000 (14:02 +1000)]
Merge remote-tracking branch 'samsung/for-next'

11 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 21 May 2013 04:00:37 +0000 (14:00 +1000)]
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/board-lager.c
arch/arm/mach-shmobile/setup-r8a7740.c
drivers/leds/Kconfig
drivers/leds/leds-renesas-tpu.c
drivers/pinctrl/sh-pfc/Kconfig

11 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:54:52 +0000 (13:54 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

11 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:54:44 +0000 (13:54 +1000)]
Merge remote-tracking branch 'msm/for-next'

11 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:53:05 +0000 (13:53 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

11 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 21 May 2013 03:53:04 +0000 (13:53 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

11 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:51:28 +0000 (13:51 +1000)]
Merge remote-tracking branch 'cortex/for-next'

11 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:49:53 +0000 (13:49 +1000)]
Merge remote-tracking branch 'bcm2835/for-next'

11 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:48:15 +0000 (13:48 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

11 years agoMerge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Tue, 21 May 2013 03:46:38 +0000 (13:46 +1000)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'

11 years agoMerge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:45:00 +0000 (13:45 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'

11 years agoMerge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Tue, 21 May 2013 03:43:20 +0000 (13:43 +1000)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'

11 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Tue, 21 May 2013 03:35:19 +0000 (13:35 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/test.c

11 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:33:41 +0000 (13:33 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

11 years agoMerge remote-tracking branch 'bcon/master'
Stephen Rothwell [Tue, 21 May 2013 03:31:26 +0000 (13:31 +1000)]
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

11 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 21 May 2013 03:29:48 +0000 (13:29 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

11 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 21 May 2013 03:28:06 +0000 (13:28 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/nvec/nvec_kbd.c

11 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 21 May 2013 03:25:56 +0000 (13:25 +1000)]
Merge remote-tracking branch 'usb/usb-next'

11 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 21 May 2013 03:08:53 +0000 (13:08 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

11 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:07:17 +0000 (13:07 +1000)]
Merge remote-tracking branch 'leds/for-next'

11 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 21 May 2013 03:05:34 +0000 (13:05 +1000)]
Merge remote-tracking branch 'regmap/for-next'

11 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:57:15 +0000 (12:57 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Tue, 21 May 2013 02:57:02 +0000 (12:57 +1000)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

Conflicts:
arch/arm/include/asm/kvm_host.h
arch/arm/kvm/arm.c

11 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 21 May 2013 02:48:42 +0000 (12:48 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 21 May 2013 02:46:58 +0000 (12:46 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:45:20 +0000 (12:45 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 21 May 2013 02:44:52 +0000 (12:44 +1000)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 21 May 2013 02:40:34 +0000 (12:40 +1000)]
Merge remote-tracking branch 'security/next'

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:38:58 +0000 (12:38 +1000)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:37:22 +0000 (12:37 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 21 May 2013 02:35:43 +0000 (12:35 +1000)]
Merge remote-tracking branch 'battery/master'

11 years agoMerge remote-tracking branch 'mfd/master'
Stephen Rothwell [Tue, 21 May 2013 02:34:05 +0000 (12:34 +1000)]
Merge remote-tracking branch 'mfd/master'

Conflicts:
drivers/mfd/intel_msic.c

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:16:28 +0000 (12:16 +1000)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 21 May 2013 02:16:23 +0000 (12:16 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Tue, 21 May 2013 02:16:08 +0000 (12:16 +1000)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:11:40 +0000 (12:11 +1000)]
Merge remote-tracking branch 'block/for-next'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:07:13 +0000 (12:07 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:07:10 +0000 (12:07 +1000)]
Merge remote-tracking branch 'input-mt/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 21 May 2013 02:05:34 +0000 (12:05 +1000)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 21 May 2013 02:03:57 +0000 (12:03 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 21 May 2013 02:02:22 +0000 (12:02 +1000)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 21 May 2013 02:00:44 +0000 (12:00 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

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

11 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 21 May 2013 01:57:31 +0000 (11:57 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

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

11 years ago20130520/crypto
Stephen Rothwell [Tue, 21 May 2013 01:43:46 +0000 (11:43 +1000)]
20130520/crypto

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 21 May 2013 01:38:08 +0000 (11:38 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 21 May 2013 01:36:30 +0000 (11:36 +1000)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 21 May 2013 01:32:25 +0000 (11:32 +1000)]
Merge remote-tracking branch 'net-next/master'

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 21 May 2013 01:30:48 +0000 (11:30 +1000)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:29:04 +0000 (11:29 +1000)]
Merge remote-tracking branch 'scsi/for-next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 21 May 2013 01:27:26 +0000 (11:27 +1000)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 21 May 2013 01:25:49 +0000 (11:25 +1000)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Tue, 21 May 2013 01:25:44 +0000 (11:25 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c

11 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Tue, 21 May 2013 01:24:04 +0000 (11:24 +1000)]
Merge remote-tracking branch 'idle/next'

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 21 May 2013 01:15:53 +0000 (11:15 +1000)]
Merge remote-tracking branch 'pm/linux-next'

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:15:43 +0000 (11:15 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:14:02 +0000 (11:14 +1000)]
Merge remote-tracking branch 'libata/for-next'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:12:20 +0000 (11:12 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 21 May 2013 01:12:12 +0000 (11:12 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 21 May 2013 01:10:38 +0000 (11:10 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:09:03 +0000 (11:09 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:07:26 +0000 (11:07 +1000)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 21 May 2013 01:05:49 +0000 (11:05 +1000)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 21 May 2013 01:03:38 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 21 May 2013 01:01:57 +0000 (11:01 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 21 May 2013 01:00:19 +0000 (11:00 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 21 May 2013 00:58:21 +0000 (10:58 +1000)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 21 May 2013 00:56:47 +0000 (10:56 +1000)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:55:15 +0000 (10:55 +1000)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 21 May 2013 00:53:42 +0000 (10:53 +1000)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:52:06 +0000 (10:52 +1000)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/testing'
Stephen Rothwell [Tue, 21 May 2013 00:50:32 +0000 (10:50 +1000)]
Merge remote-tracking branch 'ceph/testing'

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 21 May 2013 00:48:58 +0000 (10:48 +1000)]
Merge remote-tracking branch 'xtensa/for_next'

11 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 21 May 2013 00:47:22 +0000 (10:47 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 21 May 2013 00:45:48 +0000 (10:45 +1000)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:44:12 +0000 (10:44 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 21 May 2013 00:42:39 +0000 (10:42 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 21 May 2013 00:41:06 +0000 (10:41 +1000)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:39:28 +0000 (10:39 +1000)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 21 May 2013 00:39:24 +0000 (10:39 +1000)]
Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 21 May 2013 00:39:18 +0000 (10:39 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:37:45 +0000 (10:37 +1000)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 21 May 2013 00:36:13 +0000 (10:36 +1000)]
Merge remote-tracking branch 'arc/for-next'

11 years agoMerge remote-tracking branch 'mfd-fixes/master'
Stephen Rothwell [Tue, 21 May 2013 00:30:56 +0000 (10:30 +1000)]
Merge remote-tracking branch 'mfd-fixes/master'

11 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Tue, 21 May 2013 00:30:55 +0000 (10:30 +1000)]
Merge remote-tracking branch 'rr-fixes/fixes'

11 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 21 May 2013 00:30:46 +0000 (10:30 +1000)]
Merge remote-tracking branch 'ide/master'

11 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 21 May 2013 00:30:45 +0000 (10:30 +1000)]
Merge remote-tracking branch 'crypto-current/master'

11 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:40 +0000 (10:30 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

11 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:38 +0000 (10:30 +1000)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

11 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:38 +0000 (10:30 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'

11 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:37 +0000 (10:30 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'

Conflicts:
drivers/usb/host/ohci-nxp.c

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:35 +0000 (10:30 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 21 May 2013 00:30:34 +0000 (10:30 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'