Linux 4.2
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Aug 2015 18:34:09 +0000 (11:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Aug 2015 18:34:09 +0000 (11:34 -0700)
Makefile

diff --cc Makefile
Simple merge