summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 16:40:45 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-09 16:40:45 +0200
commitb8250dc4192c6adab0b9a713a11bf19afc462c96 (patch)
tree830299d0edad314367e075012ef9ca841a3026d1 /drivers/memstick
parentMerge tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 in... (diff)
parentARM: OMAP4: Enable fix for Cortex-A9 erratas (diff)
downloadlinux-b8250dc4192c6adab0b9a713a11bf19afc462c96.tar.xz
linux-b8250dc4192c6adab0b9a713a11bf19afc462c96.zip
Merge tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren <tony@atomide.com>: Changes needed for enabling SOC_BUS for the SoC revision information. Also enable few HW errata workarounds for omap4. * tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (236 commits) ARM: OMAP4: Enable fix for Cortex-A9 erratas ARM: OMAP2+: Export SoC information to userspace ARM: OMAP2+: SoC name and revision unification ARM: OMAP2+: Move common part of late init into common function Includes an update to Linux 3.9-rc6 Conflicts: arch/arm/mach-omap2/cclock44xx_data.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions