Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  block: autoconvert trivial BKL users to private mutex
  drivers: autoconvert trivial BKL users to private mutex
  ipmi: autoconvert trivial BKL users to private mutex
  mac: autoconvert trivial BKL users to private mutex
  mtd: autoconvert trivial BKL users to private mutex
  scsi: autoconvert trivial BKL users to private mutex

Fix up trivial conflicts (due to addition of private mutex right next to
deletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c

diff --cc block/bsg.c
Simple merge

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/block/pktcdvd.c
Simple merge

diff --cc drivers/char/pcmcia/cm4000_cs.c
index c7b482d15e2adb0416785fc837cc9c18b9884667,7d091b68d247aa27429f0431963e2a0b744a2003..c4e52ec85c6e5cf4a3ebfe33ce2cdeece254bffa
--- 1/drivers/char/pcmcia/cm4000_cs.c
--- 2/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@@ -54,6 -55,9 +54,8 @@@
                           __func__ , ## args);         \
        } while (0)
  
 -static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
+ static DEFINE_MUTEX(cmm_mutex);
+ 
  #define       T_1SEC          (HZ)
  #define       T_10MSEC        msecs_to_jiffies(10)
  #define       T_20MSEC        msecs_to_jiffies(20)

diff --cc drivers/char/pcmcia/cm4040_cs.c
index bf2f046fc2c122d6464dcd4c407433be9c83aa20,04c0a895740ebb9ed09ff03400360cf3bcb7e194..d7c32cb40ca3b7284a4fb30dd663e23a6429d766
--- 1/drivers/char/pcmcia/cm4040_cs.c
--- 2/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@@ -48,6 -49,10 +48,8 @@@
                           __func__ , ## args);         \
        } while (0)
  
 -static char *version =
 -"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
+ static DEFINE_MUTEX(cm4040_mutex);
+ 
  #define       CCID_DRIVER_BULK_DEFAULT_TIMEOUT        (150*HZ)
  #define       CCID_DRIVER_ASYNC_POWERUP_TIMEOUT       (35*HZ)
  #define       CCID_DRIVER_MINIMUM_TIMEOUT             (3*HZ)

diff --cc drivers/input/misc/hp_sdc_rtc.c
Simple merge

diff --cc drivers/macintosh/adb.c
Simple merge

diff --cc drivers/md/md.c
Simple merge