summaryrefslogtreecommitdiffstats
path: root/kernel/configs.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-07 18:31:54 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-07 18:31:54 +0100
commit673f8205914a12e928c65afbcd78ae748f78df53 (patch)
tree38c60215646d079fab3bff812e094e914960c7ec /kernel/configs.c
parentcf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff)
parentae1a25da8448271a99745da03100d5299575a269 (diff)
downloadop-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.zip
op-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.tar.gz
Merge branch 'linus' into core/locking
Conflicts: fs/btrfs/locking.c
Diffstat (limited to 'kernel/configs.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud