Merge branch 'master'

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/kernel.h
index c3958ea,181c69c..06c2768
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -32,8 -32,8 +32,9 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
  #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+ #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
  
  #define       KERN_EMERG      "<0>"   /* system is unusable                   */
  #define       KERN_ALERT      "<1>"   /* action must be taken immediately     */