| commit | 66d383de0963dd351051304e36247e9a6fa66b77 | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Fri Mar 07 11:56:04 2014 -0800 |
| committer | Ethan Chen <intervigil@gmail.com> | Fri Mar 07 11:56:04 2014 -0800 |
| tree | 5cd17ffcb6edfa4385a2ceddb63ada9efdea2ee1 | |
| parent | c523abc466c9b7c693e4a528ca2f54c6e931b6a6 [diff] | |
| parent | 2606524141e4ff9b6a5d0bcbd9d601dfc5a8285c [diff] |
Merge tag 'v3.4.82' into cm-11.0 This is the 3.4.82 stable release Conflicts: arch/arm/kernel/traps.c mm/internal.h Change-Id: Ie3b1ffdfe133e76cfa3eaaa4305535af8490d7cc