summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/ams-delta-fiq-handler.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-20 09:34:37 (GMT)
committerArnd Bergmann <arnd@arndb.de>2012-03-20 09:34:47 (GMT)
commit489e7bece7f6859a7df484a4dce08fa51fb0d876 (patch)
treed930d7c3a69490a24916236feac68ad863c06702 /arch/arm/mach-omap1/ams-delta-fiq-handler.S
parentf82989bde1cfa5e2b4614d8e4896d795dae418d9 (diff)
parent5353ec2cd13deb4f70aef1dcd296cadaac3f780b (diff)
downloadlinux-489e7bece7f6859a7df484a4dce08fa51fb0d876.tar.xz
Merge branch 'fixes' into next/fixes-non-critical
The one fix didn't make the cut for 3.3, so we're putting it into v3.4. Tony tells me "There are more patches needed to make multiple smsc91x instances work, but we need to hear from people with such boards first. Then those can be tagged for stable.", so we don't mark this patch stable yet. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/ams-delta-fiq-handler.S')
0 files changed, 0 insertions, 0 deletions