author | Thomas Gleixner <tglx@linutronix.de> | |
Sat, 19 Dec 2015 10:03:18 +0000 (11:03 +0100) | ||
committer | Thomas Gleixner <tglx@linutronix.de> | |
Sat, 19 Dec 2015 10:03:18 +0000 (11:03 +0100) |
Pull in update changes so we can apply conflicting patches
Trivial merge