- remove redundant merge conflict
[linux-2.6.git] / include / linux / reboot.h
2005-04-04 Aaron Klingamankexec applied from
2005-02-08 Marc Fiuczynskiupgrade to linux 2.6.10-1.12_FC2
2005-01-28 Marc Fiuczynskicleanup to reduce diff w/ 2.6.9-1.11_FC2
2005-01-21 Marc Fiuczynskiupgrade to linux 2.6.9-1.11_FC2
2004-12-14 Aaron Klingamankexec patch backported from 2.6.10-mm
2004-06-02 Mark HuangMerge to Fedora kernel-2.6.6-1.406
2004-06-02 Mark HuangThis commit was generated by cvs2svn to compensate...