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

Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

Browse source 
Conflicts:
	drivers/oprofile/oprofile_stats.c
	drivers/usb/otg/Kconfig
	drivers/usb/otg/Makefile

Signed-off-by: Robert Richter <[email protected]>
This commit is contained in:
Robert Richter 2009-07-14 15:20:44 +02:00
commit debc6a6927
8059 changed files with 762642 additions and 408998 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/oprofile/oprofile_stats.c
View file

@ -33,6 +33,7 @@ void oprofile_reset_stats(void)
atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
atomic_set(&oprofile_stats.event_lost_overflow, 0);
atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
}