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}
This commit is contained in:
Linus Torvalds 2011-11-01 20:24:30 -07:00
commit 510597e26e
29 changed files with 0 additions and 1307 deletions