summaryrefslogtreecommitdiffstats
path: root/fs/timerfd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:15:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:15:44 -0700
commiteda054770e5cd0e9ee1568dfcbcf39f9ade4f545 (patch)
tree60d29e2a3b095e9d14657cc6e02daba0a1b5f63d /fs/timerfd.c
parent891a9894ee2e17646b29117635d2c7adfb58ce60 (diff)
parent837c4ef13c44296bb763a0ca0e84a076592474cf (diff)
downloadlinux-stable-eda054770e5cd0e9ee1568dfcbcf39f9ade4f545.tar.gz
linux-stable-eda054770e5cd0e9ee1568dfcbcf39f9ade4f545.tar.bz2
linux-stable-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/timerfd.c')
0 files changed, 0 insertions, 0 deletions