Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 08:32:54 +0000 (10:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 08:33:55 +0000 (10:33 +0200)
commit3272cab4063467410802367a8d69f06c65b2a866
tree1c665f8572b0aab2a5343d32b5eaa6713669b04f
parentf629299b544b6cc12b4e3e85fec96f4ce5809482
parent140d0b2108faebc77c6523296e211e509cb9f5f9
Merge branch 'linus' into perf/urgent

Merge reason: Include most of the merge window trees, to do fixes on top.

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