]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ad11ab b8e4d89)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 06:06:15 +0000 (22:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 06:06:15 +0000 (22:06 -0800)
1  2 
kernel/power/disk.c patch | diff1 | diff2 | blob | history

diff --cc kernel/power/disk.c
Simple merge
Linux 2.6 source tree