Merged revisions 294313 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Mon, 8 Nov 2010 22:33:01 +0000 (22:33 +0000)
committerJeff Peeler <jpeeler@digium.com>
Mon, 8 Nov 2010 22:33:01 +0000 (22:33 +0000)
commit9a257b9f9708d9efb542bf989215236b5bbbf94b
treecbdb44b50d72de6129476fa7331010e525bb5f06
parent12a40275f2ca61d45114aa8d6c75506a6401a17b
Merged revisions 294313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r294313 | jpeeler | 2010-11-08 16:32:13 -0600 (Mon, 08 Nov 2010) | 9 lines

  Merged revisions 294312 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r294312 | jpeeler | 2010-11-08 16:30:49 -0600 (Mon, 08 Nov 2010) | 1 line

    add missing unlock not present in 294277
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_timing_timerfd.c