]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba9912e 783707a)
Merge intel.com:/home/lenb/bk/linux-2.6.8
authorLen Brown <len.brown@intel.com>
Wed, 11 Aug 2004 08:05:47 +0000 (04:05 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 11 Aug 2004 08:05:47 +0000 (04:05 -0400)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

1  2 
drivers/acpi/sleep/proc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/sleep/proc.c
Simple merge
Linux kernels and configurations used by Zygo.