Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 0 insertions, 1 deletions

diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index dded26368111..862a2f16db64 100644
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -118,7 +118,6 @@ int nfs_cache_register_sb(struct super_block *sb, struct cache_detail *cd)
         struct dentry *dir;
 
         dir = rpc_d_lookup_sb(sb, "cache");
-        BUG_ON(dir == NULL);
         ret = sunrpc_cache_register_pipefs(dir, cd->name, 0600, cd);
         dput(dir);
         return ret;