diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /Documentation/input/iforce-protocol.txt | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/input/iforce-protocol.txt')
| -rw-r--r-- | Documentation/input/iforce-protocol.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt index 3ac92413c874..2d5fbfd6023e 100644 --- a/Documentation/input/iforce-protocol.txt +++ b/Documentation/input/iforce-protocol.txt | |||
| @@ -251,7 +251,7 @@ Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy. | |||
| 251 | 251 | ||
| 252 | ** Author of this document ** | 252 | ** Author of this document ** |
| 253 | Johann Deneux <johann.deneux@gmail.com> | 253 | Johann Deneux <johann.deneux@gmail.com> |
| 254 | Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/ | 254 | Home page at http://web.archive.org/web/*/http://www.esil.univ-mrs.fr |
| 255 | 255 | ||
| 256 | Additions by Vojtech Pavlik. | 256 | Additions by Vojtech Pavlik. |
| 257 | 257 | ||