diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:01:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:01:33 -0800 |
| commit | e5c13537b0153010b4f65b9c55faa78a4c151c93 (patch) | |
| tree | 6e2d3eae7532040f070888eb6116fe917f9648e0 /include/linux/i2c.h | |
| parent | include/linux/kernel.h: Move logging bits to include/linux/printk.h (diff) | |
| parent | PCI: sysfs: fix printk warnings (diff) | |
| download | linux-dev-e5c13537b0153010b4f65b9c55faa78a4c151c93.tar.xz linux-dev-e5c13537b0153010b4f65b9c55faa78a4c151c93.zip | |
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: sysfs: fix printk warnings
PCI: fix pci_bus_alloc_resource() hang, prefer positive decode
PCI: read current power state at enable time
PCI: fix size checks for mmap() on /proc/bus/pci files
x86/PCI: coalesce overlapping host bridge windows
PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
Diffstat (limited to 'include/linux/i2c.h')
0 files changed, 0 insertions, 0 deletions