Merge ../linux-2.6 by hand

This commit is contained in:
Paul Mackerras
2005-10-31 13:37:12 +11:00
2476 changed files with 119495 additions and 59935 deletions

View File

@ -1036,10 +1036,8 @@ static void __exit mace_cleanup(void)
{
macio_unregister_driver(&mace_driver);
if (dummy_buf) {
kfree(dummy_buf);
dummy_buf = NULL;
}
kfree(dummy_buf);
dummy_buf = NULL;
}
MODULE_AUTHOR("Paul Mackerras");