linux/drivers/s390/char
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
..
con3215.c
con3270.c
ctrlchar.c
ctrlchar.h
defkeymap.c
defkeymap.map
fs3270.c
Kconfig
keyboard.c
keyboard.h
Makefile
monreader.c
monwriter.c
raw3270.c
raw3270.h
sclp_async.c
sclp_cmd.c
sclp_con.c
sclp_config.c
sclp_cpi_sys.c
sclp_cpi_sys.h
sclp_cpi.c
sclp_quiesce.c
sclp_rw.c
sclp_rw.h
sclp_sdias.c
sclp_tty.c
sclp_tty.h
sclp_vt220.c
sclp.c Fix IRQ flag handling naming 2010-10-07 14:08:55 +01:00
sclp.h
tape_34xx.c
tape_3590.c
tape_3590.h
tape_block.c block: autoconvert trivial BKL users to private mutex 2010-10-05 15:01:10 +02:00
tape_char.c
tape_class.c
tape_class.h
tape_core.c
tape_proc.c
tape_std.c
tape_std.h
tape.h
tty3270.c
tty3270.h
vmcp.c
vmcp.h
vmlogrdr.c
vmur.c
vmur.h
vmwatchdog.c
zcore.c