summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-01 20:24:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-01 20:24:30 -0700
commit510597e26e2a072e2d46ea5bc57feaf385e37f70 (patch)
tree5ffe90e6569481506b06fb6d6a409655fac4f7f6 /arch/arm/mach-mxs/Makefile
parentcd9a0b6bd67ec372b0ef3cb2abe26974f888b956 (diff)
parent4702abd3f9728893ad5b0f4389e1902588510459 (diff)
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
* 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc: ARM: mach-nuc93x: delete Fix up trivial delete/edit conflicts in arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
0 files changed, 0 insertions, 0 deletions