]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita5a5a6c6156c6e3615198846b452b720d6124df8
tree7cd33f69e3661327739ae4c96e5a8389e7fc912e
parentb63955013b91382a60a83aea0109c2bd401d8cf0
parentbec71e2096204f9d061f8384352ebeb59abc2b06
Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

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

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