Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[linux-2.6] / drivers / ide / pci / sc1200.c
2005-04-16  Pavel Machek[PATCH] fix u32 vs. pm_message_t in rest of the tree
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2