Linux 3.18-rc5
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Nov 2014 00:36:20 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Nov 2014 00:36:20 +0000 (16:36 -0800)
Makefile

diff --cc Makefile
Simple merge