tree 1f9d19f1642d263e65906a916a48be9339accc73
parent 5671a10e2bc7f99d9157c6044faf8be2ef302361
parent b57f95a38233a2e73b679bea4a5453a1cc2a1cc9
author Frederic Weisbecker <fweisbec@gmail.com> 1273699141 +0200
committer Frederic Weisbecker <fweisbec@gmail.com> 1273699233 +0200

Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.