git.baikalelectronics.ru Git - kernel.git/commit

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

author	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 22 Oct 2010 17:49:54 +0000 (10:49 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 22 Oct 2010 17:49:54 +0000 (10:49 -0700)
commit	c86a1f7564800e09948ed776118605fd74af8f9a
tree	25dabf2d905e1410819d1bdaba0bf5f779100d3c	tree \| snapshot
parent	7c36e568b2f398a5735566837de4e4fb7d041f26	commit \| diff
parent	f525a846c435ad400506edd5216e88b775c3e63f	commit \| diff

block/bsg.c	diff1 \|	diff2 \|	blob \| history
drivers/block/cciss.c	diff1 \|	diff2 \|	blob \| history
drivers/block/pktcdvd.c	diff1 \|	diff2 \|	blob \| history
drivers/char/pcmcia/cm4000_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/char/pcmcia/cm4040_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/hp_sdc_rtc.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/adb.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history