| commit | b3ce1debe2685383a9ad6ace9c49869c3968c013 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 07 10:24:08 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 07 10:24:08 2005 -0800 |
| tree | dcb606fac467d6ce78a9c608a1e0d2323af44f2b | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 [diff] | |
| parent | c2965f1129ee54afcc4ef293ff0f25fa3a7e7392 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6 Some manual fixups for clashing kfree() cleanups etc.