Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'

Browse Source

Conflicts:
	arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller

2011-05-20 13:10:22 -07:00

parent 9fafbd8061 317f394160

commit 90d3ac15e5

39 changed files with 509 additions and 385 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

639

kernel/sched.c

File diff suppressed because it is too large Load Diff