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-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-next' into for-linus

Browse source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina 2009-12-07 18:36:35 +01:00
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sound/oss/Kconfig
View file

@ -1,5 +1,3 @@
# drivers/sound/Config.in
#
# 18 Apr 1998, Michael Elizabeth Chastain, <mailto:[email protected]>
# More hacking for modularisation.
#

2
sound/oss/dmasound/dmasound_paula.c
View file

@ -657,7 +657,7 @@ static int AmiStateInfo(char *buffer, size_t space)
len += sprintf(buffer+len, "\tsound.volume_right = %d [0...64]\n",
dmasound.volume_right);
if (len >= space) {
printk(KERN_ERR "dmasound_paula: overlowed state buffer alloc.\n") ;
printk(KERN_ERR "dmasound_paula: overflowed state buffer alloc.\n") ;
len = space ;
}
return len;