diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-12 21:38:56 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-12 21:39:04 +0200 |
commit | f46a6804135795f77d096ab0128f27531c7d051c (patch) | |
tree | 7cd33f69e3661327739ae4c96e5a8389e7fc912e /Documentation/svga.txt | |
parent | Merge branch 'perf/core' into perf/urgent (diff) | |
parent | Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (diff) | |
download | linux-f46a6804135795f77d096ab0128f27531c7d051c.tar.xz linux-f46a6804135795f77d096ab0128f27531c7d051c.zip |
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>
Diffstat (limited to 'Documentation/svga.txt')
0 files changed, 0 insertions, 0 deletions