From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 17:49:54 +0000 (-0700)
Subject: Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c37927d4359e81b85de644f8fb08878717cf5f3f;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'trivial' of git://git./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
---

c37927d4359e81b85de644f8fb08878717cf5f3f
diff --cc drivers/char/pcmcia/cm4000_cs.c
index c7b482d15e2a,7d091b68d247..c4e52ec85c6e
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@@ -54,6 -55,9 +54,8 @@@
  			   __func__ , ## args);		\
  	} while (0)
  
+ static DEFINE_MUTEX(cmm_mutex);
 -static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
+ 
  #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 bf2f046fc2c1,04c0a895740e..d7c32cb40ca3
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@@ -48,6 -49,10 +48,8 @@@
  			   __func__ , ## args);		\
  	} while (0)
  
+ static DEFINE_MUTEX(cm4040_mutex);
 -static char *version =
 -"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
+ 
  #define	CCID_DRIVER_BULK_DEFAULT_TIMEOUT  	(150*HZ)
  #define	CCID_DRIVER_ASYNC_POWERUP_TIMEOUT 	(35*HZ)
  #define	CCID_DRIVER_MINIMUM_TIMEOUT 		(3*HZ)