Merge branch 'linus' into pci-for-jesse
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:39:59 +0000 (22:39 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 20:39:59 +0000 (22:39 +0200)

Trivial merge