Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

This reverts Serban's out-of-tree binder changes and moves to
the new binder protocol approach merged into AOSP.

Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --cc drivers/staging/android/binder_trace.h
index c661e376398fff129c5411482d9743248c8e9b44,7f20f3dc83690cad36cfa82c2a946384a8c30bb8..02add80b62a0f7644d1892bbfbeec2f992a85bce
--- 1/drivers/staging/android/binder_trace.h
--- 2/drivers/staging/android/binder_trace.h
+++ b/drivers/staging/android/binder_trace.h
@@@ -184,11 -185,12 +185,12 @@@ TRACE_EVENT(binder_transaction_ref_to_n
                __entry->ref_debug_id = ref->debug_id;
                __entry->ref_desc = ref->desc;
                __entry->node_debug_id = ref->node->debug_id;
 -              __entry->node_ptr = ref->node->ptr;
 +              __entry->node_ptr = (void __user *)ref->node->ptr;
        ),
-       TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p",
+       TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%016llx",
                  __entry->debug_id, __entry->node_debug_id,
-                 __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr)
+                 __entry->ref_debug_id, __entry->ref_desc,
+                 (u64)__entry->node_ptr)
  );
  
  TRACE_EVENT(binder_transaction_ref_to_ref,