projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd9a0b6 4702abd)
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)
commit510597e26e2a072e2d46ea5bc57feaf385e37f70
tree5ffe90e6569481506b06fb6d6a409655fac4f7f6tree | snapshot (tar.gz zip)
parentcd9a0b6bd67ec372b0ef3cb2abe26974f888b956commit | diff
parent4702abd3f9728893ad5b0f4389e1902588510459commit | 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}
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/Makefile diff1 | diff2 | blob | history