Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h
This commit is contained in:
Benjamin Herrenschmidt
2009-02-18 13:19:25 +11:00
233 changed files with 10707 additions and 10005 deletions

View File

@@ -1312,6 +1312,7 @@
#define PCI_DEVICE_ID_VIA_VT3351 0x0351
#define PCI_DEVICE_ID_VIA_VT3364 0x0364
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_6415 0x0415
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
#define PCI_DEVICE_ID_VIA_82C561 0x0561
#define PCI_DEVICE_ID_VIA_82C586_1 0x0571