Linux 2.6.12 v2.6.12
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 17 Jun 2005 19:48:29 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 17 Jun 2005 19:48:29 +0000 (12:48 -0700)
Makefile

diff --cc Makefile
Simple merge