summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-08 13:23:54 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-08 13:23:54 +0100
commit13e652800d1644dfedcd0d59ac95ef0beb7f3165 (patch)
tree6cdd9771bd9a56de1b0246a330ccd916ecdb1d41 /init
parent4332bdd332a2dca93dc3b1d017b2dd27d5c8cef3 (diff)
parent88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff)
parent88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff)
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git