Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git] / drivers / parport / ieee1284_ops.c
2005-09-10 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-10 Nishanth Aravamudan[PATCH] parport: fix-up schedule_timeout() usage
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2