Linux 3.17-rc7
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Sep 2014 21:29:07 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Sep 2014 21:29:07 +0000 (14:29 -0700)
Makefile

diff --cc Makefile
Simple merge