A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse source 
* '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)
This commit is contained in:
Linus Torvalds 2012-01-08 13:21:22 -08:00
commit 98793265b4
176 changed files with 266 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/misc/ibmasm/command.c
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/dot_command.c
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/dot_command.h
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/event.c
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/heartbeat.c
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/i2o.h
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/ibmasm.h
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/ibmasmfs.c
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/lowlevel.c
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/lowlevel.h
View file

@ -17,7 +17,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/module.c
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
* This driver is based on code originally written by Pete Reynolds
* and others.

2
drivers/misc/ibmasm/r_heartbeat.c
View file

@ -16,7 +16,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/

2
drivers/misc/ibmasm/remote.h
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
* Originally written by Pete Reynolds
*/

2
drivers/misc/ibmasm/uart.c
View file

@ -18,7 +18,7 @@
*
* Copyright (C) IBM Corporation, 2004
*
* Author: Max Asböck <amax@us.ibm.com>
* Author: Max Asböck <amax@us.ibm.com>
*
*/