Merge branch 'linus' into x86/gart
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:26 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:26 +0000 (12:30 +0200)
commit037a6079eb925f7653bddf1501f777abcd4fc91e
tree2249c4c4852837163e67190bf8bfe06516a65510
parent0754557d72c1fbfc5fcfd5235e7c23ae6f77248c
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/gart
drivers/char/agp/amd64-agp.c