merge by hand - fix up rejections in Documentation/DocBook/Makefile
[platform/kernel/linux-starfive.git] / include / asm-sparc / vaddrs.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2