diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 09:28:43 +0100 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 09:28:43 +0100 | 
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /include/linux/cpu.h | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c
Diffstat (limited to 'include/linux/cpu.h')
| -rw-r--r-- | include/linux/cpu.h | 5 | 
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 4823af64e9db..5f09323ee880 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -10,11 +10,6 @@   *   * CPUs are exported via sysfs in the class/cpu/devices/   * directory.  - * - * Per-cpu interfaces can be implemented using a struct device_interface.  - * See the following for how to do this:  - * - drivers/base/intf.c  - * - Documentation/driver-model/interface.txt   */  #ifndef _LINUX_CPU_H_  #define _LINUX_CPU_H_  | 
