| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Wed Oct 22 23:57:26 2008 -0400 |
| committer | Len Brown <len.brown@intel.com> | Thu Oct 23 00:11:07 2008 -0400 |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 [diff] | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 [diff] |
Merge branch 'linus' into test Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c arch/x86/kernel/acpi/sleep.c drivers/acpi/Kconfig drivers/pnp/Makefile drivers/pnp/quirks.c Signed-off-by: Len Brown <len.brown@intel.com>