]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c822e4c 8691c0d)
Merge branch 'next/smp' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Oct 2012 13:02:53 +0000 (15:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Oct 2012 13:02:59 +0000 (15:02 +0200)
new version of the socfpga patch, replacing the older one.

Conflicts:
arch/arm/configs/socfpga_defconfig
arch/arm/mach-socfpga/platsmp.c

1  2 
arch/arm/configs/socfpga_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/socfpga_defconfig
Simple merge
Linux kernel for KaRo TX COM modules