Merge branch 'for-next' into for-linus

Conflicts:

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

View File

@@ -1286,7 +1286,7 @@ x86_perf_event_set_period(struct perf_event *event,
return 0;
/*
* If we are way outside a reasoable range then just skip forward:
* If we are way outside a reasonable range then just skip forward:
*/
if (unlikely(left <= -period)) {
left = period;