OSDN Git Service

resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Wed, 12 Sep 2012 23:08:14 +0000 (16:08 -0700)
committerElliott Hughes <enh@google.com>
Wed, 12 Sep 2012 23:08:14 +0000 (16:08 -0700)
commitf801cf55bebc8d0d397fbe6db8cc91b3afb78149
treea45eaf32f0a057f7e4b3fb7db2333d9c84491b0c
parentccd7ee624a81d61675fa08e149fe190a317341eb
parent47bda0c293c167f12ddde6e66192ad581c4a67e1
resolved conflicts for merge of 47bda0c2 to jb-mr1-dev

Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
libc/kernel/common/linux/sync.h