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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/

diff --cc fs/buffer.c
Simple merge

diff --cc fs/dcache.c
index aaca5e7970bc0a6e8fbf9cf0bfc94ac594c4b0e2,0778f49f993b81946a488d46f415344ed7bad2cd..19458d3995024123c226e4de7a950ff71319462b
--- 1/fs/dcache.c
--- 2/fs/dcache.c
+++ b/fs/dcache.c
@@@ -34,9 -34,8 +34,8 @@@
  #include <linux/swap.h>
  #include <linux/bootmem.h>
  
- /* #define DCACHE_DEBUG 1 */
  
 -int sysctl_vfs_cache_pressure = 100;
 +int sysctl_vfs_cache_pressure __read_mostly = 100;
  EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
  
   __cacheline_aligned_in_smp DEFINE_SPINLOCK(dcache_lock);

diff --cc ipc/sem.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mempool.c
Simple merge