summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/scall32-o32.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-07 21:57:31 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-07 21:57:31 +0200
commit526b264163068f77c5f2409031f5e25caf3900a9 (patch)
tree196e7581f1546e48ba392ff099f369e5c622636b /arch/mips/kernel/scall32-o32.S
parentARM: mx5: fix clock usage for suspend (diff)
parentMerge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup (diff)
downloadlinux-526b264163068f77c5f2409031f5e25caf3900a9.tar.xz
linux-526b264163068f77c5f2409031f5e25caf3900a9.zip
Merge branch 'imx/cleanup' into imx/devel
This helps resolve the conflicts between the imx cleanups and the new code that has gone into the imx tree. Conflict resolution was originally done by Sascha Hauer. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/kernel/scall32-o32.S')
0 files changed, 0 insertions, 0 deletions