1
linux/drivers/char/ipmi
Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
ipmi_bt_sm.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
ipmi_devintf.c ipmi: fix __init and __exit attribute locations 2010-10-27 18:03:13 -07:00
ipmi_kcs_sm.c drivers/char/ipmi: Use KCS_IDLE_STATE 2009-12-16 07:20:10 -08:00
ipmi_msghandler.c ipmi: convert to seq_file interface 2011-05-26 17:12:37 -07:00
ipmi_poweroff.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ipmi_si_intf.c ipmi: convert to seq_file interface 2011-05-26 17:12:37 -07:00
ipmi_si_sm.h
ipmi_smic_sm.c
ipmi_watchdog.c ipmi_watchdog: restore settings when BMC reset 2011-12-20 10:25:04 -08:00
Kconfig
Makefile drivers/char/ipmi/Makefile: replace the use of <module>-objs with <module>-y 2010-10-27 18:03:14 -07:00