| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Mar 04 12:12:08 2016 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Mar 04 12:12:08 2016 +0100 |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f | |
| parent | 4650bac1fc45d64aef62ab99aa4db93d41dedbd9 [diff] | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af [diff] |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict Signed-off-by: Ingo Molnar <mingo@kernel.org>