diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:35:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:35:28 -0700 |
commit | fe31eb679752369240fc8880858a5ed974554eb2 (patch) | |
tree | b53fcdb696b6d2048d5a38960aee64f990e2997a /mm/tiny-shmem.c | |
parent | efbfe96c5d839c367249bf1cd53249716450c0a2 (diff) | |
parent | 3560cc5ec3488b20d927f7160a21a0df1d1fda20 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Remove quirk_via_abnormal_poweroff
PCI: reset pci device state to unknown state for resume
PCI: x86-64: mmconfig missing printk levels
PCI: fix pci_fixup_video as it blows up on sparc64
acpiphp: fix latch status
Diffstat (limited to 'mm/tiny-shmem.c')
0 files changed, 0 insertions, 0 deletions