summaryrefslogtreecommitdiff
path: root/SubmittingPatches
diff options
context:
space:
mode:
Diffstat (limited to 'SubmittingPatches')
0 files changed, 0 insertions, 0 deletions
i/linux/net-next.git/diff/block/bsg.c?id=c37927d4359e81b85de644f8fb08878717cf5f3f&id2=5704e44d283e907623e3775c1262f206a2c48cf3'>diff)parent2a48fc0ab24241755dc93bfd4f01d68efab47f5a (diff)
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
Diffstat (limited to 'block/bsg.c')