]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e231c6e aab2ca4)
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
authorLen Brown <len.brown@intel.com>
Sat, 14 Aug 2004 12:26:29 +0000 (08:26 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 14 Aug 2004 12:26:29 +0000 (08:26 -0400)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

1  2 
init/main.c patch | diff1 | diff2 | blob | history

diff --cc init/main.c
Simple merge
Linux kernels and configurations used by Zygo.