| commit | 7391663e2764c3288cb2f1e5d9aeda58783a88fc | [log] [tgz] |
|---|---|---|
| author | Simon Sickle <simon@simonsickle.com> | Sat Feb 06 15:12:42 2016 -0800 |
| committer | Simon Sickle <simon@simonsickle.com> | Sat Feb 06 15:12:42 2016 -0800 |
| tree | d01b0ef6fdd1a0f72070278e4777ce744fd771df | |
| parent | 3b5cf7cd55e5d1adb55164bbdb672baac0aa8fd1 [diff] | |
| parent | a54a4f4a5ebd890e7ab179c4f55b7be77c6da4d0 [diff] |
Merge branch 'android-tegra-flounder-3.10-marshmallow-mr1' of https://android.googlesource.com/kernel/tegra into android-6.0 Conflicts: arch/arm64/configs/flounder_defconfig build.config drivers/android/binder.c drivers/misc/uid_cputime.c