Linus Torvalds c37927d435 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
2010-10-22 10:49:54 -07:00
..
2010-08-11 08:59:08 -07:00
2010-05-27 09:12:41 -07:00
2009-09-23 07:39:46 -07:00
2010-06-29 15:29:31 -07:00
2009-09-23 07:39:43 -07:00
2009-04-01 08:59:24 -07:00
2010-08-05 13:26:17 +01:00
2009-09-23 07:39:43 -07:00
2009-09-23 07:39:43 -07:00
2010-08-11 08:59:08 -07:00
2009-04-02 01:05:32 +00:00
2009-09-23 07:39:43 -07:00
2010-08-11 08:59:08 -07:00
2009-12-16 07:20:00 -08:00