aboutsummaryrefslogtreecommitdiffstats
path: root/Kbuild
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-07 11:15:40 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-07 11:15:40 +0200
commit5e34437840d33554f69380584311743b39e8fbeb (patch)
treee081135619ee146af5efb9ee883afca950df5757 /Kbuild
parentsoftlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP (diff)
parentNFS: Fix a double free in nfs_parse_mount_options() (diff)
downloadlinux-dev-5e34437840d33554f69380584311743b39e8fbeb.tar.xz
linux-dev-5e34437840d33554f69380584311743b39e8fbeb.zip
Merge branch 'linus' into core/softlockup
Conflicts: kernel/sysctl.c
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions