]> 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)
commit5bf0ed94c85a107a8cea1d208e81b715a9e208fc
tree5ffe90e6569481506b06fb6d6a409655fac4f7f6
parent3d88ed320230675af2a70febf273a084ae1319be
parent355f3053ff302c69518f0deaac101e43fd89e4bc
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