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)
commit087021ba41e9481202103d51d3dd0c4706899a2b
treebf5d67420fd176682a1f8f1e9342ad397c23937a
parentfb9c818873a788c5c01c9868cc6050df96e2c7df
parente83c2b0ff325f52dda1aff3572d0e1516216c54b
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>