]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 12 Aug 2010 19:38:56 +0000 (21:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 12 Aug 2010 19:39:04 +0000 (21:39 +0200)
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>

Trivial merge