merge by hand - fix up rejections in Documentation/DocBook/Makefile
[powerpc.git] / arch / m68k / math-emu / fp_trig.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2