Merge branch 'linus' into perfcounters/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 1 Jul 2009 07:56:10 +0000 (09:56 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 1 Jul 2009 07:56:26 +0000 (09:56 +0200)
Merge reason: this branch was on a .30-ish base before, update
              it to an almost-.31-rc2 upstream base to pick up fixes.

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

Trivial merge