core/linux-kirkwood to 3.18-2; revert upstream commits to (re)enable cpuidle,watchdog,leds