Linux 3.18-rc6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Nov 2014 23:25:20 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Nov 2014 23:25:20 +0000 (15:25 -0800)
Makefile

diff --cc Makefile
Simple merge