tree 837372297501a2d144358b44e7db3f88c5612aa2
parent 8b5b94e4e9813cdd77103827f48d58c806ab45c6
parent d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a
author Ingo Molnar <mingo@elte.hu> 1240243687 +0200
committer Ingo Molnar <mingo@elte.hu> 1240243692 +0200

Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.

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