android_kernel_google_msm/drivers/char/ipmi
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
..
ipmi_bt_sm.c
ipmi_devintf.c ipmi: autoconvert trivial BKL users to private mutex 2010-09-15 21:00:48 +02:00
ipmi_kcs_sm.c drivers/char/ipmi: Use KCS_IDLE_STATE 2009-12-16 07:20:10 -08:00
ipmi_msghandler.c ipmi: update driver to use dev_printk and its constructs 2010-05-27 09:12:50 -07:00
ipmi_poweroff.c
ipmi_si_intf.c ipmi: fix hardcoded ipmi device exit path warning 2010-09-22 17:22:40 -07:00
ipmi_si_sm.h
ipmi_smic_sm.c
ipmi_watchdog.c ipmi: autoconvert trivial BKL users to private mutex 2010-09-15 21:00:48 +02:00
Kconfig
Makefile