Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp

@@ -0,0 +1,20 @@
+--- xbmc-12.2.orig/xbmc/utils/CharsetConverter.cpp	2013-05-03 07:57:41.000000000 +0200
++++ xbmc-12.2/xbmc/utils/CharsetConverter.cpp	2013-11-05 14:10:44.000000000 +0100
+@@ -140,7 +140,7 @@ static struct SCharsetMapping
+ #define ICONV_PREPARE(iconv) iconv=(iconv_t)-1
+ #define ICONV_SAFE_CLOSE(iconv) if (iconv!=(iconv_t)-1) { iconv_close(iconv); iconv=(iconv_t)-1; }
+ 
+-size_t iconv_const (void* cd, const char** inbuf, size_t *inbytesleft,
++size_t iconv_const (iconv_t cd, const char** inbuf, size_t *inbytesleft,
+                     char* * outbuf, size_t *outbytesleft)
+ {
+     struct iconv_param_adapter {
+@@ -157,7 +157,7 @@ size_t iconv_const (void* cd, const char
+         const char** p;
+     };
+ 
+-    return iconv((iconv_t)cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft);
++    return iconv(cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft);
+ }
+ 
+ template<class INPUT,class OUTPUT>

target/mips/sys-available/qemu-mips64

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	select ADK_big
 	select ADK_qemu_mips64
 	select ADK_KERNEL_MIPS_MALTA
+	select ADK_KERNEL_PAGE_SIZE_4KB
 	select ADK_KERNEL_CPU_BIG_ENDIAN
 	select ADK_CPU_MIPS64
 	select ADK_HARDWARE_QEMU

target/mips/sys-available/qemu-mips64el

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	select ADK_little
 	select ADK_qemu_mips64el
 	select ADK_KERNEL_MIPS_MALTA
+	select ADK_KERNEL_PAGE_SIZE_4KB
 	select ADK_KERNEL_CPU_LITTLE_ENDIAN
 	select ADK_KERNEL_CPU_MIPS64
 	select ADK_KERNEL_CPU_MIPS64_R1