diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 21:30:08 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 21:30:08 +0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /include/video/sisfb.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
| download | linux-3dd392a407d15250a501fa109cc1f93fee95ef85.tar.xz | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'include/video/sisfb.h')
0 files changed, 0 insertions, 0 deletions