diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 15:54:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 15:54:36 -0700 |
commit | 22a4427972af371fddb49c0184a93851ad51070d (patch) | |
tree | 2d513301698bc8c5b691caf7268a57f296fdf69d /kernel/power/disk.c | |
parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
parent | ede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'kernel/power/disk.c')
0 files changed, 0 insertions, 0 deletions