summaryrefslogtreecommitdiffstats
path: root/kernel/wait.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:24:08 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:24:08 -0800
commitb3ce1debe2685383a9ad6ace9c49869c3968c013 (patch)
treedcb606fac467d6ce78a9c608a1e0d2323af44f2b /kernel/wait.c
parent5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff)
parentc2965f1129ee54afcc4ef293ff0f25fa3a7e7392 (diff)
downloadop-kernel-dev-b3ce1debe2685383a9ad6ace9c49869c3968c013.zip
op-kernel-dev-b3ce1debe2685383a9ad6ace9c49869c3968c013.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Some manual fixups for clashing kfree() cleanups etc.
Diffstat (limited to 'kernel/wait.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud