Merge branch 'master' into for-upstream
[linux-2.6] / drivers / s390 / ebcdic.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2