diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 | 
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /lib | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
 "Usual stuff -- comment/printk typo fixes, documentation updates, dead
  code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  HOWTO: fix double words typo
  x86 mtrr: fix comment typo in mtrr_bp_init
  propagate name change to comments in kernel source
  doc: Update the name of profiling based on sysfs
  treewide: Fix typos in various drivers
  treewide: Fix typos in various Kconfig
  wireless: mwifiex: Fix typo in wireless/mwifiex driver
  messages: i2o: Fix typo in messages/i2o
  scripts/kernel-doc: check that non-void fcts describe their return value
  Kernel-doc: Convention: Use a "Return" section to describe return values
  radeon: Fix typo and copy/paste error in comments
  doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
  various: Fix spelling of "asynchronous" in comments.
  Fix misspellings of "whether" in comments.
  eisa: Fix spelling of "asynchronous".
  various: Fix spelling of "registered" in comments.
  doc: fix quite a few typos within Documentation
  target: iscsi: fix comment typos in target/iscsi drivers
  treewide: fix typo of "suport" in various comments and Kconfig
  treewide: fix typo of "suppport" in various comments
  ...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 10 | ||||
| -rw-r--r-- | lib/bitmap.c | 2 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 41faf0b8df1d..e458782f3c52 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1115,7 +1115,7 @@ config NOTIFIER_ERROR_INJECTION  	depends on DEBUG_KERNEL  	select DEBUG_FS  	help -	  This option provides the ability to inject artifical errors to +	  This option provides the ability to inject artificial errors to  	  specified notifier chain callbacks. It is useful to test the error  	  handling of notifier call chain failures. @@ -1126,7 +1126,7 @@ config CPU_NOTIFIER_ERROR_INJECT  	depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION  	help  	  This option provides a kernel module that can be used to test -	  the error handling of the cpu notifiers by injecting artifical +	  the error handling of the cpu notifiers by injecting artificial  	  errors to CPU notifier chain callbacks.  It is controlled through  	  debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu @@ -1150,7 +1150,7 @@ config PM_NOTIFIER_ERROR_INJECT  	depends on PM && NOTIFIER_ERROR_INJECTION  	default m if PM_DEBUG  	help -	  This option provides the ability to inject artifical errors to +	  This option provides the ability to inject artificial errors to  	  PM notifier chain callbacks.  It is controlled through debugfs  	  interface /sys/kernel/debug/notifier-error-inject/pm @@ -1173,7 +1173,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT  	tristate "Memory hotplug notifier error injection module"  	depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION  	help -	  This option provides the ability to inject artifical errors to +	  This option provides the ability to inject artificial errors to  	  memory hotplug notifier chain callbacks.  It is controlled through  	  debugfs interface under /sys/kernel/debug/notifier-error-inject/memory @@ -1196,7 +1196,7 @@ config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT  	tristate "pSeries reconfig notifier error injection module"  	depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION  	help -	  This option provides the ability to inject artifical errors to +	  This option provides the ability to inject artificial errors to  	  pSeries reconfig notifier chain callbacks.  It is controlled  	  through debugfs interface under  	  /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/ diff --git a/lib/bitmap.c b/lib/bitmap.c index 06fdfa1aeba7..06f7e4fe8d2d 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -353,7 +353,7 @@ again:  EXPORT_SYMBOL(bitmap_find_next_zero_area);  /* - * Bitmap printing & parsing functions: first version by Bill Irwin, + * Bitmap printing & parsing functions: first version by Nadia Yvette Chambers,   * second version by Paul Jackson, third by Joe Korty.   */ | 
