]> err.no Git - linux-2.6/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 19:41:16 +0000 (12:41 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 19:41:16 +0000 (12:41 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge