aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-18 15:05:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-18 15:05:22 -0700
commit2044f2282d7558c765270d78e19dbdcf6190ca71 (patch)
tree03b2c4d211fa8e7e2ef8c489d28a16442f030d57 /kernel/sysctl.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (diff)
parentPCI: fall back to original BIOS BAR addresses (diff)
downloadlinux-dev-2044f2282d7558c765270d78e19dbdcf6190ca71.tar.xz
linux-dev-2044f2282d7558c765270d78e19dbdcf6190ca71.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: fall back to original BIOS BAR addresses
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions