From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 03:24:30 +0000 (-0700)
Subject: Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=510597e26e2a072e2d46ea5bc57feaf385e37f70;p=linux-beck.git

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}
---

510597e26e2a072e2d46ea5bc57feaf385e37f70