Merge branch 'timecounter-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Jan 2015 21:47:51 +0000 (16:47 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jan 2015 21:47:51 +0000 (16:47 -0500)
commitdd9553988879a3ff71a86323b88409e7631c4e5d
tree5d81ba6687d57e773084e7d80a66f3ecbce59796
parentb422da7c366fbf0899db1fdc808fc5fd6700dec5
parent5ce07a5cef5094168d25296773681bc287e21e3b
Merge branch 'timecounter-next'

Richard Cochran says:

====================
Fixing the "Time Counter fixes and improvements"

For this series I had only tested the build with ARCH=x86 and arm, but
others like sparc64, microblaze, powerpc, and s390 will fail because
they somehow don't indirectly include clocksource.h for the drivers in
question.

This series fixes the build issues reported by:
 kbuild test robot <fengguang.wu@intel.com>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>