tree 7cd33f69e3661327739ae4c96e5a8389e7fc912e
parent b3e84ffa21f916e3354a12a7f19169c9febe96d0
parent ad41a1e0cab07c5125456e8d38e5b1ab148d04aa
author Ingo Molnar <mingo@elte.hu> 1281641936 +0200
committer Ingo Molnar <mingo@elte.hu> 1281641944 +0200

Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

 de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

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