merge by hand - fix up rejections in Documentation/DocBook/Makefile

This commit is contained in:
James Bottomley
2005-05-20 15:27:44 -05:00
1282 changed files with 32304 additions and 15748 deletions

View File

@@ -450,7 +450,7 @@ static int aac_cfg_open(struct inode *inode, struct file *file)
}
}
return 0;
return err;
}
/**