summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sh-msiof.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-03 03:06:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-03 03:06:03 +0100
commit7cbe010a5ea728d7c4440b11a1a3997faca0e46d (patch)
tree9132c4c60a236f58f532086a0d8b8cc3fdf180fc /drivers/spi/spi-sh-msiof.c
parentStaging: lustre: lnet: lnet: Better cookie gen (diff)
parentLinux 3.18-rc3 (diff)
downloadlinux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.tar.xz
linux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.zip
Merge 3.18-rc3 into staging-next
We want the upstream fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
0 files changed, 0 insertions, 0 deletions