summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spidev.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:21:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:21:04 +0100
commit988addf82e4c03739375279de73929580a2d4a6a (patch)
tree989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/spi/spidev.c
parentMerge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into dev... (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console (diff)
downloadlinux-988addf82e4c03739375279de73929580a2d4a6a.tar.xz
linux-988addf82e4c03739375279de73929580a2d4a6a.zip
Merge branch 'origin' into devel-stable
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'drivers/spi/spidev.c')
0 files changed, 0 insertions, 0 deletions