Merge branch 'linus'
commite336e7745c9f445571b6b064038307cbc01bebfd
authorIngo Molnar <mingo@elte.hu>
Sun, 10 Jul 2011 16:18:11 +0000 (10 18:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 10 Jul 2011 16:18:11 +0000 (10 18:18 +0200)
tree117f8ebcfd6904b18c21f54b303aed12496b3a17
parentae823662ba3250b9f02df4e6d8cebba111e24a8c
parentaa4c495e3d24335bedbed56cca47ec9ee1e1b390
Merge branch 'linus'
drivers/pci/pci.h