projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 305a410 f2ec29a)
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Mon, 25 Nov 2013 18:54:08 +0000 (10:54 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 25 Nov 2013 18:54:08 +0000 (10:54 -0800)
commit2c6193b7527e92a5916e6f798ddf47401afa17c3
treeb7a3efa93f354255d2466691da3b41c9df6e4b72tree | snapshot
parent305a41042d6127e9596f66382bf4e81a70e24bb3commit | diff
parentf2ec29aa62924e6b1ce5edb3bfc7dcd206023740commit | diff
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

Update to latest android-3.10 branch.

Minor conflict with the direct printk stuff

Signed-off-by: John Stultz <john.stultz@linaro.org>
drivers/staging/android/ion/ion_chunk_heap.c diff1 | diff2 | blob | history
kernel/printk.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.