| commit | 74cfe2dcc0f4b17f9abbabf349e33c39a260987e | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Tue Dec 16 00:35:23 2014 -0800 |
| committer | Ethan Chen <intervigil@gmail.com> | Tue Dec 16 00:35:23 2014 -0800 |
| tree | 206493082f5edc72fdac6c958877090d7d17fb37 | |
| parent | a580da13cb3f1f4984e71befc4f78c5a1f3181d0 [diff] | |
| parent | 6cf93503105dc0cf63fc1384088db92bb71cbe4c [diff] |
Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0 Conflicts: drivers/misc/qseecom.c fs/proc/task_mmu.c include/net/tcp.h net/ipv4/syncookies.c net/ipv6/route.c net/ipv6/tcp_ipv6.c Change-Id: I8a953e9f483a24ee45f5e1c570b6a4f92e87c6e9