OSDN Git Service

Merge commit 'origin/master' into prelink
authorCarmelo Amoroso <carmelo.amoroso@st.com>
Fri, 24 Sep 2010 07:02:41 +0000 (09:02 +0200)
committerCarmelo Amoroso <carmelo.amoroso@st.com>
Fri, 24 Sep 2010 07:02:41 +0000 (09:02 +0200)
commit8d29ef117dba66ab67419a69d272779d50f147f0
treea8df75081898112b27252393792156124c89a84c
parentb9766aa08c90b6718d5497d6a6cf9e6f737e5141
parent74407db52d3953c7f3c6b8a53661cfc96cb07e22
Merge commit 'origin/master' into prelink

Conflicts:

ldso/ldso/sh/elfinterp.c

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
ldso/ldso/sh/elfinterp.c