diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:25:02 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:25:02 -0700 |
| commit | ba3aaf137c521cdfdb8e16499dfadc977e5feb53 (patch) | |
| tree | b0099a7a04a670dc263ef29bd46adbce1d9bca55 /test/nptl/tst-timer2.c | |
| parent | 4737dfdde5e78df1c5f6d4c7adc8351a0c788c9b (diff) | |
poll.c: fix incorrect merge
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/nptl/tst-timer2.c')
0 files changed, 0 insertions, 0 deletions