linux-stable

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00

History

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

ixj_pcmcia.c

pcmcia: move driver name to struct pcmcia_driver

2010-09-29 17:20:24 +02:00

ixj-ver.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ixj.c

drivers: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:04 +02:00

ixj.h

[PATCH] drivers/telephony/ixj: Convert to generic boolean