git.maquefel.me Git - linux.git/commit

author	Thomas Gleixner <tglx@linutronix.de>
	Sat, 27 Jan 2018 14:35:29 +0000 (15:35 +0100)
committer	Thomas Gleixner <tglx@linutronix.de>
	Sat, 27 Jan 2018 14:35:29 +0000 (15:35 +0100)
commit	303c146df1c4574db3495d9acc5c440dd46c6b0f
tree	fbcea289aea24da8a44c7677a776988bb3c8bcbe	tree \| snapshot
parent	b1a31a5f5f27ff8aba42b545a1c721941f735107	commit \| diff
parent	d5421ea43d30701e03cadc56a38854c36a8b4433	commit \| diff

Merge branch 'timers/urgent' into timers/core

Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git