Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Mon, 3 Mar 2014 09:00:52 +0000 (01:00 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 3 Mar 2014 09:00:52 +0000 (01:00 -0800)
commit34f3211a85449939f787260237538dfb714ddb43
treed1193851ef104a650e66e5777eeaf00c6b7d6fef
parent6e23832c042e05fcc25f9d26e7e3f7959cce7c54
parenteb131375b589db97c04218c0d9fb5c5873cec0bf
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>
drivers/staging/android/binder_trace.h