Merge by hand (whitespace conflicts in libata.h)
[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / isdn / divert / Makefile
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2