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

@@ -220,7 +220,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
/*
* If we are seeing only the odd spurious IRQ caused by
* bus asynchronicity then don't eventually trigger an error,
* otherwise the couter becomes a doomsday timer for otherwise
* otherwise the counter becomes a doomsday timer for otherwise
* working systems
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))

View File

@@ -476,7 +476,7 @@ static void perf_event_remove_from_context(struct perf_event *event)
if (!task) {
/*
* Per cpu events are removed via an smp call and
* the removal is always sucessful.
* the removal is always successful.
*/
smp_call_function_single(event->cpu,
__perf_event_remove_from_context,
@@ -845,7 +845,7 @@ perf_install_in_context(struct perf_event_context *ctx,
if (!task) {
/*
* Per cpu events are installed via an smp call and
* the install is always sucessful.
* the install is always successful.
*/
smp_call_function_single(cpu, __perf_install_in_context,
event, 1);

View File

@@ -580,7 +580,7 @@ sysfs_show_current_clocksources(struct sys_device *dev,
* @count: length of buffer
*
* Takes input from sysfs interface for manually overriding the default
* clocksource selction.
* clocksource selection.
*/
static ssize_t sysfs_override_clocksource(struct sys_device *dev,
struct sysdev_attribute *attr,