| commit | d97a860c4f3de98ba5040a22f305b7159fe17cff | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Fri Feb 21 21:36:40 2014 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Fri Feb 21 21:37:09 2014 +0100 |
| tree | 90c2155ec5a1f3115a9eb7a86f25d1a4610227c6 | |
| parent | 3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9 [diff] | |
| parent | d158fc7f36a25e19791d25a55da5623399a2644f [diff] |
Merge branch 'linus' into sched/core Reason: Bring bakc upstream modification to resolve conflicts Signed-off-by: Thomas Gleixner <tglx@linutronix.de>