e79ed9b85e80d6641f2448997eb844d04002f649 - pub/scm/linux/kernel/git/mpe/linux-next

commit: e79ed9b85e80d6641f2448997eb844d04002f649
[log]
author: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 18:42:16 2015 +1000
committer: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 18:42:16 2015 +1000
tree: c5d4b8ca156214b7b0e3d3460ff6764db6427fc4
parent: 123ed28d0811617e5a0a9f96e650720768ff80d6 [diff]
parent: 645d558b1cd5d489cbeb23c37a4b9dd7d113f329 [diff]

Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
	drivers/clocksource/Makefile
	drivers/clocksource/timer-stm32.c

tree: c5d4b8ca156214b7b0e3d3460ff6764db6427fc4