| commit | db610f7571f287db43c153ce26dd20dbd44d5173 | [log] [tgz] |
|---|---|---|
| author | Matt Mower <mowerm@gmail.com> | Fri Aug 01 14:53:55 2014 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Fri Aug 01 14:53:55 2014 -0700 |
| tree | 2b972c70901065346d4dea9365a5319f788e2814 | |
| parent | 5ffeb0ef32669ed7b5905a60961d9b4bbd2b4d6d [diff] | |
| parent | 5bfc8718998bedfeea1997d83838ffd1981cbf12 [diff] |
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.41' into cm-11.0 Conflicts: kernel/events/core.c Change-Id: I52dfe8b56924fb2d86bf1487eed6114342621603