summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/include/mach/debug-macro.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-20 10:34:37 +0100
committerArnd Bergmann <arnd@arndb.de>2012-03-20 10:34:47 +0100
commit489e7bece7f6859a7df484a4dce08fa51fb0d876 (patch)
treed930d7c3a69490a24916236feac68ad863c06702 /arch/arm/mach-s3c2410/include/mach/debug-macro.S
parentMerge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into ... (diff)
parentMerge branch 'fix-smsc911x-regulator' of git://git.kernel.org/pub/scm/linux/k... (diff)
downloadlinux-489e7bece7f6859a7df484a4dce08fa51fb0d876.tar.xz
linux-489e7bece7f6859a7df484a4dce08fa51fb0d876.zip
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-s3c2410/include/mach/debug-macro.S')
0 files changed, 0 insertions, 0 deletions