Merge branch 'linus' into x86/fixmap
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
commit8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8
tree8f1f746f98707fb82bcec281ee8f65216eddae36
parenta1d5a8691f1b6c92491747bea3b778b184fa5837
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/fixmap
arch/x86/xen/enlighten.c