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)
commit6d72b7952fa7d7c61d021398970c29afde6a4443
tree31c00be8e2837e2db2e62c694421a93a9f4c79d7
parent6360b1fbb4a939efd34fc770c2ebd927c55506e0
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into core/rodata
arch/parisc/kernel/vmlinux.lds.S