diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 11:33:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-19 11:33:10 -0800 |
| commit | eae34c67940f2a71837ed30d571b93572186d46b (patch) | |
| tree | 8bfb4a473601e8d87eadd8bf4f66cf3122be35c7 /include/linux/mtd | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
| parent | 3e3d0e9246d0eccc1da800348fc1b9199ae3d768 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI hotplug: ibmphp: Fix module ref count underflow
PCI hotplug: acpiphp wants a 64-bit _SUN
PCI: pciehp: fix unexpected power off with pciehp_force
PCI: fix aer resume sanity check
Diffstat (limited to 'include/linux/mtd')
0 files changed, 0 insertions, 0 deletions