Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
David Woodhouse
2006-12-01 09:56:43 +00:00
1188 changed files with 14724 additions and 10026 deletions

View File

@@ -358,7 +358,7 @@ struct nand_buffers {
* @priv: [OPTIONAL] pointer to private chip date
* @errstat: [OPTIONAL] hardware specific function to perform additional error status checks
* (determine if errors are correctable)
* @write_page [REPLACEABLE] High-level page write function
* @write_page: [REPLACEABLE] High-level page write function
*/
struct nand_chip {