]> git.hungrycats.org Git - linux/commitdiff
Merge groveronline.com:/root/bk/linux-mochel
authorAndy Grover <agrover@groveronline.com>
Thu, 13 Feb 2003 06:30:48 +0000 (22:30 -0800)
committerAndy Grover <agrover@groveronline.com>
Thu, 13 Feb 2003 06:30:48 +0000 (22:30 -0800)
into groveronline.com:/root/bk/linux-acpi

1  2 
drivers/acpi/osl.c
drivers/acpi/pci_bind.c

Simple merge
Simple merge