| commit | 510597e26e2a072e2d46ea5bc57feaf385e37f70 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 01 20:24:30 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 01 20:24:30 2011 -0700 |
| tree | 5ffe90e6569481506b06fb6d6a409655fac4f7f6 | |
| parent | cd9a0b6bd67ec372b0ef3cb2abe26974f888b956 [diff] | |
| parent | 4702abd3f9728893ad5b0f4389e1902588510459 [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}