Merge branch 'linux-2.6' into for-2.6.22

This commit is contained in:
Paul Mackerras
2007-04-30 12:38:01 +10:00
1949 changed files with 101561 additions and 76740 deletions
+1 -1
View File
@@ -139,7 +139,7 @@ config FB_TILEBLITTING
This is particularly important to one driver, matroxfb. If
unsure, say N.
comment "Frambuffer hardware drivers"
comment "Frame buffer hardware drivers"
depends on FB
config FB_CIRRUS