Manual merge with Linus.
[safe/jmp/linux-2.6] / drivers / parport / Makefile
2006-02-03 Arnaud Giersch[PATCH] parport: add parallel port support for SGI O2
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2