Elliott Hughes 16b557e1b2 Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge ...

Conflicts:
	libc/arch-arm/bionic/__restore.S
	libc/arch-arm/cortex-a15/bionic/stpcpy.S
	libc/arch-arm/cortex-a9/bionic/stpcpy.S
	libc/arch-arm64/generic/bionic/memcpy_base.S
	libc/arch-x86/bionic/__restore.S
	libc/arch-x86/x86.mk
	libc/arch-x86_64/bionic/__restore_rt.S
	tests/stack_unwinding_test.cpp
	tests/stack_unwinding_test_impl.c

Change-Id: I2cb250ad78e9da6f390bc279aec742564b75e6c7

2014-10-28 16:06:57 -07:00

..

atom

Replace ambiguous cmp operator with cmpl.

2014-10-21 16:25:35 -07:00

bionic

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

2014-10-28 16:06:57 -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-10-01 16:04:31 -07:00

silvermont

Regenerate the bionic NOTICE files.

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

syscalls

Add clock_settime and clock_nanosleep.

2014-10-13 17:04:10 -07:00

x86.mk

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

2014-10-28 16:06:57 -07:00