tree bf5d67420fd176682a1f8f1e9342ad397c23937a
parent fb9c818873a788c5c01c9868cc6050df96e2c7df
parent e83c2b0ff325f52dda1aff3572d0e1516216c54b
author Ingo Molnar <mingo@elte.hu> 1246434970 +0200
committer Ingo Molnar <mingo@elte.hu> 1246434986 +0200

Merge branch 'linus' into perfcounters/urgent

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>