Merge branch 'mainline' into upstream-linus
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
commit919251758195919ae3568021bc221e4f8c4b20eb
tree81137a037ff8e6c91cc8de72d568275605c653c5
parentc394f1eafef61c6666f5876afde6110a276c4c9f
parent3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a
Merge branch 'mainline' into upstream-linus
Documentation/feature-removal-schedule.txt
MAINTAINERS