Linux 3.18-rc2
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2014 23:48:41 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2014 23:48:41 +0000 (16:48 -0700)
Makefile

diff --cc Makefile
Simple merge