iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c37927d435
linux/drivers/char/pcmcia
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
..
ipwireless pcmcia: avoid messages on module (un)loading 2010-09-29 17:20:25 +02:00
cm4000_cs.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
cm4040_cs.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
cm4040_cs.h
Kconfig pcmcia: ipwireless depends on NETDEVICES 2008-02-13 16:21:20 -08:00
Makefile ipwireless: driver for PC Card 3G/UMTS modem 2008-02-07 17:19:49 -08:00
synclink_cs.c pcmcia: synclink_cs: fix information leak to userland 2010-10-21 17:29:23 +02:00