aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-14 21:58:46 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-14 21:58:46 -0500
commit7116317dc9148d783846299fc80a7d377baa6dca (patch)
tree55616e245d7e6f509753d06da03c7b8c4e3896f7 /kernel/power
parent2499604960fff307fe99ff4d4363c50eaa69235a (diff)
parent0afaa4fc4abc773ce129f41009a50eeecf3aa50c (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'kernel/power')
0 files changed, 0 insertions, 0 deletions