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)
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

1  2 
arch/c6x/include/asm/Kbuild

Simple merge