Linux 3.16
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Aug 2014 22:25:02 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Aug 2014 22:25:02 +0000 (15:25 -0700)
Makefile

diff --cc Makefile
Simple merge