Merge branch 'restart-cleanup' into restart

This commit is contained in:
Russell King
2011-11-21 09:49:47 +00:00
105 changed files with 450 additions and 470 deletions
@@ -18,8 +18,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
local_irq_disable();
if (machine_is_n2100()) {
gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);