Merge ../torvalds-2.6/
[powerpc.git] / drivers / parport / parport_atari.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2