Merge branch 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 21:00:16 +0000 (13:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 21:00:16 +0000 (13:00 -0800)
commit75777c1855e10c010c9c3a21611d95dd9be01ab1
tree9272331ff0709629cc8a1dcbf9dbd856c0fc345a
parentc3ce79d6a89e25fe0db1851b1b72e6d0dffc8a66
parentca3060d39ae7a0964f8c123a4833029981e86476
Merge branch 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull tiny c6x update from Mark Salter.

* 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: Use generic clkdev.h header
arch/c6x/include/asm/Kbuild