diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /kernel/time/clocksource.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 5e18c6ab2c6a..c403567f78c0 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -580,7 +580,7 @@ sysfs_show_current_clocksources(struct sys_device *dev, | |||
| 580 | * @count: length of buffer | 580 | * @count: length of buffer |
| 581 | * | 581 | * |
| 582 | * Takes input from sysfs interface for manually overriding the default | 582 | * Takes input from sysfs interface for manually overriding the default |
| 583 | * clocksource selction. | 583 | * clocksource selection. |
| 584 | */ | 584 | */ |
| 585 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, | 585 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, |
| 586 | struct sysdev_attribute *attr, | 586 | struct sysdev_attribute *attr, |