summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 21:41:58 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 21:41:58 -0800
commitb11d0e48aa41b644143ca526ef8d69212fdc1cdd (patch)
treebb55e976402bc87cc8a9f5372dc947500777216b /init
parent47807ce381acc34a7ffee2b42e35e96c0f322e52 (diff)
parentdfa159886f38344ede31e3b13ec614e0bebc09c6 (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