Merge branch 'devicetree/merge' into spi/merge
[pandora-kernel.git] / kernel / smp.c
diff --cc kernel/smp.c
Simple merge