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
..
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2010-01-25 15:00:49 +01:00
2009-12-14 21:17:26 +01:00
2010-05-27 19:59:01 +02:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:26 +01:00
2010-08-05 13:26:19 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-09 20:35:45 +01:00
2010-01-10 20:52:35 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2010-01-10 20:52:35 +01:00
2009-09-15 17:18:13 +02:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00