summaryrefslogtreecommitdiff
path: root/Events/XDC2015/Program.mdwn
diff options
context:
space:
mode:
authormperes <mperes@web>2015-09-17 12:22:12 -0700
committerxorg <iki-xorg@freedesktop.org>2015-09-17 12:22:12 -0700
commit5f536968ee037ddb881642dc3020bb2567d4adf5 (patch)
tree205c757c8f04b80e861c889c426c5ba0ea1b7bd9 /Events/XDC2015/Program.mdwn
parentb7d17f94236c3577ce86cb3cddde774d43fdd37d (diff)
update the name of the talk of Lyude
Diffstat (limited to 'Events/XDC2015/Program.mdwn')
-rw-r--r--Events/XDC2015/Program.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/Events/XDC2015/Program.mdwn b/Events/XDC2015/Program.mdwn
index ab51a635..55c68ada 100644
--- a/Events/XDC2015/Program.mdwn
+++ b/Events/XDC2015/Program.mdwn
@@ -71,7 +71,7 @@ NOTE: Scheduling in progress all times are tentative.
<tr>
<td>3:00pm</td><td>-</td><td>3:45pm</td>
- <td> [[Stephen Chandler Paul - ps2emu presentation request for XDC 2015|Program#paul_ps2emu]]</td>
+ <td> [[Stephen Chandler Paul - An Introduction to PS/2 and ps2emu|Program#paul_ps2emu]]</td>
</tr>
<tr>
@@ -276,7 +276,7 @@ It'll feature lots of examples from existing atomic drivers, too.
Presenter: Daniel Vetter
<a name="paul_ps2emu"></a>
-### ps2emu presentation request for XDC 2015 (formally accepted)
+### An Introduction to PS/2 and ps2emu
The project I'm hoping to present is ps2emu,
a set of userspace tools and a kernel module that allow userspace