merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-3.10.git] / arch / ia64 / hp / zx1 /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 master