Commit 12b8aeee authored Mar 15, 2010 by Ingo Molnar

Merge branch 'linus' into timers/core



Conflicts:
	Documentation/feature-removal-schedule.txt

Merge reason: Resolve the conflict, update to upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parents 25268498 a3d3203e

Expand all Show whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment