merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-2.6] / net / atm / mpc.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2