]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into x86/i8259
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:33 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:33 +0000 (12:30 +0200)
1  2 
arch/x86/kernel/Makefile

Simple merge