]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 03:24:30 +0000 (20:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 03:24:30 +0000 (20:24 -0700)
commitd33dfe22f08a43b3f5cc08f38e640b93e602592b
tree5ffe90e6569481506b06fb6d6a409655fac4f7f6
parent667b454d53b91f61d94da8eab0175eee809c221c
parent36990cbbe5056cb4948c92b058ea75f6a77ef47a
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}
arch/arm/Kconfig
arch/arm/Makefile