Commits

Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>