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-Tag: v2.6.37-rc1~175
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c37927d4359e81b85de644f8fb08878717cf5f3f;p=pandora-kernel.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
Reading git-diff-tree failed