aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds2005-09-05 05:50:36 -0700
committerLinus Torvalds2005-09-05 05:50:36 -0700
commit94f8c66e5e543d79231abf203d6e514ecb668688 (patch)
tree79f240cb13dd3da5879a7cf52ca1beca4650311d /init
parentda1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 (diff)
parentd0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (diff)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions