tree 11c773f780186fdb9fbc9c80a73fb7c8426b1fba
parent 98c2aaf8be5baf7193be37fb28bce8e7327158bc
parent d508afb437daee7cf07da085b635c44a4ebf9b38
author Ingo Molnar <mingo@elte.hu> 1239098721 +0200
committer Ingo Molnar <mingo@elte.hu> 1239098725 +0200

Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

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

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