Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 10:05:21 +0000 (12:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 10:05:25 +0000 (12:05 +0200)
Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

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

Trivial merge