| commit | dde448d95d8698ee4c8373bb48fe08a22f41052f | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Thu Jun 20 11:32:42 2013 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Thu Jun 20 11:32:42 2013 -0700 |
| tree | 7fe87fa93bfa5b81e6f87b147e32512d2e8198e3 | |
| parent | ac4f6190fae02a3dc30133f90488b996f726bf7a [diff] | |
| parent | f95b978981a7d154ba40d14c18e8ed5c694e6124 [diff] |
Merge tag 'v3.4.10' into cm-10.1 This is the 3.4.10 stable release Conflicts: arch/arm/mm/tlb-v7.S arch/arm/vfp/entry.S drivers/base/power/main.c drivers/mmc/host/sdhci.c drivers/net/tun.c drivers/usb/core/hub.c drivers/usb/host/xhci.h include/linux/sched.h kernel/power/suspend.c Change-Id: Ia2477ec93ceb64b13dd1a2d8aa646cb233387d14