Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 41f24369e47..c093642fb98 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -38,8 +38,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
         int err;
         int jbegin_failure = 0;
 
-        if (!S_ISREG(inode->i_mode))
-                BUG();
+        BUG_ON(!S_ISREG(inode->i_mode));
 
         /* fast out for when nothing needs to be done */
         if ((atomic_read(&inode->i_count) > 1 ||
@@ -125,8 +124,7 @@ static int reiserfs_sync_file(struct file *p_s_filp,
         int n_err;
         int barrier_done;
 
-        if (!S_ISREG(p_s_inode->i_mode))
-                BUG();
+        BUG_ON(!S_ISREG(p_s_inode->i_mode));
         n_err = sync_mapping_buffers(p_s_inode->i_mapping);
         reiserfs_write_lock(p_s_inode->i_sb);
         barrier_done = reiserfs_commit_for_inode(p_s_inode);