OSDN Git Service

Merge commit 'origin/master' into prelink
authorCarmelo Amoroso <carmelo.amoroso@st.com>
Sun, 28 Nov 2010 20:09:47 +0000 (21:09 +0100)
committerCarmelo Amoroso <carmelo.amoroso@st.com>
Sun, 28 Nov 2010 20:09:47 +0000 (21:09 +0100)
commit57f6cce72c889f2e7b342e87a565a064320a6ee2
tree5466406472918d3adb63398f5fb9ea1511a5e73f
parent4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119
parent5dea871ac73ef4608022c058b50adc946917f9b9
Merge commit 'origin/master' into prelink

Conflicts:

ldso/include/dl-hash.h

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Makerules
extra/Configs/Config.in
ldso/include/dl-hash.h