diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 09:17:17 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 09:17:17 -0800 |
commit | cbf50a4125f5242dd70b1f2342dbba2d94c6d94e (patch) | |
tree | a97a067e53f32e246034fbbb07e2c0894c279391 /drivers/base/cpu.c | |
parent | 7a8ea7ebe4cf698918e7d3c860587e815eaa0f28 (diff) | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) |
Merge 3.8-rc4 into usb-next
This pulls in all of the -rc4 fixes into usb-next to sync things up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/cpu.c')
-rw-r--r-- | drivers/base/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 63452943abd..fb10728f637 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -224,7 +224,7 @@ static void cpu_device_release(struct device *dev) * by the cpu device. * * Never copy this way of doing things, or you too will be made fun of - * on the linux-kerenl list, you have been warned. + * on the linux-kernel list, you have been warned. */ } |