diff options
author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
tree | 962e068491b752a944f61c454fad3f8619a1ea3f /arch/x86/video/fbdev.c | |
parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/video/fbdev.c')
-rw-r--r-- | arch/x86/video/fbdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c index 48fb38d7d2c0..4db42bff8c60 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/fbdev.c @@ -1,5 +1,4 @@ /* - * arch/i386/video/fbdev.c - i386 Framebuffer * * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com> * |