diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 19:49:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 19:49:54 +0200 |
| commit | c37927d4359e81b85de644f8fb08878717cf5f3f (patch) | |
| tree | 25dabf2d905e1410819d1bdaba0bf5f779100d3c /fs/ncpfs/ioctl.c | |
| parent | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl (diff) | |
| parent | block: autoconvert trivial BKL users to private mutex (diff) | |
| download | linux-c37927d4359e81b85de644f8fb08878717cf5f3f.tar.xz linux-c37927d4359e81b85de644f8fb08878717cf5f3f.zip | |
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 'fs/ncpfs/ioctl.c')
0 files changed, 0 insertions, 0 deletions