Merge branch 'linus' into x86/threadinfo
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:53:03 +0000 (11:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:53:03 +0000 (11:53 +0200)
commit009b9fc98ddd83f9139fdabb12c0d7a8535d5421
treef7d3e182407d2ebe50a9b8db6361ac910027a1cf
parent3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca
parent481c5346d0981940ee63037eb53e4e37b0735c10
Merge branch 'linus' into x86/threadinfo
include/asm-x86/page_32.h