summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-09 01:10:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-09 01:10:29 +0100
commit522dba7134d6b2e5821d3457f7941ec34f668e6d (patch)
treee2ad937216c513a545abbe4ccff0c57519b9c080 /fs
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parentPCI/PM Runtime: Make runtime PM of PCI devices inactive by default (diff)
downloadlinux-522dba7134d6b2e5821d3457f7941ec34f668e6d.tar.xz
linux-522dba7134d6b2e5821d3457f7941ec34f668e6d.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/PM Runtime: Make runtime PM of PCI devices inactive by default
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions