diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:28:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:28:23 +1000 |
| commit | 2dd3971a277830f03a0231fee7a3e83a8975fc6d (patch) | |
| tree | 10ee62fcbf9ae9c4c4824bdd6774f3cccb94f3c7 /Documentation | |
| parent | 3cdb27cd09c97991c4c675512f940a9e66c3dd27 (diff) | |
| parent | df736f6915a24373481fde09ede0b573348cddbf (diff) | |
Merge branch 'quilt/rr'
Conflicts:
arch/um/drivers/hostaudio_kern.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt index a99d7031cdf9..45d5a217484f 100644 --- a/Documentation/cpu-hotplug.txt +++ b/Documentation/cpu-hotplug.txt @@ -2,7 +2,7 @@ Maintainers: CPU Hotplug Core: - Rusty Russell <rusty@rustycorp.com.au> + Rusty Russell <rusty@rustcorp.com.au> Srivatsa Vaddagiri <vatsa@in.ibm.com> i386: Zwane Mwaikambo <zwane@arm.linux.org.uk> |