Conflicts:
	arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2011-05-20 13:10:22 -07:00
commit 90d3ac15e5
39 changed files with 501 additions and 377 deletions

File diff suppressed because it is too large Load diff