ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 52f283c1edb2..dbd860af0804 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -465,7 +465,7 @@ struct iattr {
         struct timespec ia_ctime;
 
         /*
-         * Not an attribute, but an auxilary info for filesystems wanting to
+         * Not an attribute, but an auxiliary info for filesystems wanting to
          * implement an ftruncate() like method.  NOTE: filesystem should
          * check for (ia_valid & ATTR_FILE), and not for (ia_file != NULL).
          */
@@ -613,6 +613,8 @@ struct address_space_operations {
         int (*error_remove_page)(struct address_space *, struct page *);
 };
 
+extern const struct address_space_operations empty_aops;
+
 /*
  * pagecache_write_begin/pagecache_write_end must be used by general code
  * to write into the pagecache.
@@ -647,7 +649,7 @@ struct address_space {
 } __attribute__((aligned(sizeof(long))));
         /*
          * On most architectures that alignment is already the case; but
-         * must be enforced here for CRIS, to let the least signficant bit
+         * must be enforced here for CRIS, to let the least significant bit
          * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.
          */