diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 23:15:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 23:15:44 +0200 |
| commit | eda054770e5cd0e9ee1568dfcbcf39f9ade4f545 (patch) | |
| tree | 60d29e2a3b095e9d14657cc6e02daba0a1b5f63d /fs/btrfs/file.c | |
| parent | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar... (diff) | |
| parent | PCI: clear bridge resource range if BIOS assigned bad one (diff) | |
| download | linux-eda054770e5cd0e9ee1568dfcbcf39f9ade4f545.tar.xz linux-eda054770e5cd0e9ee1568dfcbcf39f9ade4f545.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: clear bridge resource range if BIOS assigned bad one
PCI: hotplug/cpqphp, fix NULL dereference
Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
PCI: change resource collision messages from KERN_ERR to KERN_INFO
Diffstat (limited to 'fs/btrfs/file.c')
0 files changed, 0 insertions, 0 deletions