]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into core/rodata
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:24:00 +0000 (11:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:24:00 +0000 (11:24 +0200)
1  2 
arch/parisc/kernel/vmlinux.lds.S

Simple merge