1e09481365ce248dbb4eb06dad70129bb5807037 - linux - Git at Google

commit: 1e09481365ce248dbb4eb06dad70129bb5807037
[log]
author: Ingo Molnar <mingo@elte.hu>
Tue Jul 15 23:12:58 2008 +0200
committer: Ingo Molnar <mingo@elte.hu>
Tue Jul 15 23:12:58 2008 +0200
tree: c0cff5bef95c8b5e7486f144718ade9a06c284dc
parent: 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 [diff]
parent: b9d2252c1e44fa83a4e65fdc9eb93db6297c55af [diff]

Merge branch 'linus' into core/softlockup

Conflicts:

	kernel/softlockup.c

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

tree: c0cff5bef95c8b5e7486f144718ade9a06c284dc