Merge by hand from Linus' tree.
[linux-2.6] / net / lapb / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2