merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-2.6] / fs / nls / nls_base.c
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-05  Adrian Bunk[PATCH] make some things static
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2