Linux 3.17-rc4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Sep 2014 23:09:43 +0000 (16:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Sep 2014 23:09:43 +0000 (16:09 -0700)
Makefile

diff --cc Makefile
Simple merge