merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-3.10.git] / arch / ia64 / hp /
drwxr-xr-x   ..
drwxr-xr-x - common
drwxr-xr-x - sim
drwxr-xr-x - zx1