summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 08:53:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 08:53:56 -0800
commit90ac8f7741be4ff66de1f52904f4f67f272f74ce (patch)
treed20316f5eb9fe399edd81c14d801602aac64a752 /init
parent98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff)
parent50630195bbdfe1ca775d94cd68a5f18bc1b717e4 (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions