Merge remote-tracking branch 'origin/master' into kernel-update

This commit is contained in:
Arne Fitzenreiter
2012-08-03 16:40:50 +02:00
4 changed files with 16 additions and 6 deletions

View File

@@ -466,7 +466,7 @@ usr/bin/ldd
#usr/lib/crt1.o
#usr/lib/crti.o
#usr/lib/crtn.o
#usr/lib/gconv
usr/lib/gconv
#usr/lib/gconv/ANSI_X3.110.so
#usr/lib/gconv/ARMSCII-8.so
#usr/lib/gconv/ASMO_449.so

View File

@@ -489,7 +489,7 @@ usr/bin/ldd
#usr/lib/crt1.o
#usr/lib/crti.o
#usr/lib/crtn.o
#usr/lib/gconv
usr/lib/gconv
#usr/lib/gconv/ANSI_X3.110.so
#usr/lib/gconv/ARMSCII-8.so
#usr/lib/gconv/ASMO_449.so