Christopher Ferris d61d2b7b80 resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp ...

Change-Id: I3cd9056d5d689b783f4afa870397ad4d9de357f5

2014-10-06 16:30:45 -07:00

..

atom

Replace ambiguous cmp instruction with cmpl.

2014-08-27 15:04:23 -07:00

bionic

resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp

2014-10-06 16:30:45 -07:00

generic

Remove the unused swab.S.

2014-07-22 20:43:55 -07:00

include/machine

Add IFUNC support for arm64 and IRELATIVE reloc

2014-09-11 16:30:45 -07:00

silvermont

Regenerate the bionic NOTICE files.

2014-07-07 15:42:06 -07:00

syscalls

Add posix_fadvise(3).

2014-09-11 08:45:46 -07:00

x86.mk

resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp

2014-10-06 16:30:45 -07:00