]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit89639b5d3b3a1960fbb153f47c0326ad3f478972
tree0d195e4f14aeb5351f164b0608a715c428f3c1d7
parentc822e4c28660022accc36901158c48d95daec72c
parent8691c0db4a70fe87d9a05eec15ebfe99f6e953c1
Merge branch 'next/smp' into for-next

new version of the socfpga patch, replacing the older one.

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