diff options
| author |   Len Brown <len.brown@intel.com> | 2009-01-09 03:41:08 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:41:08 -0500 |
| commit | ec9f168fcc344d2ffec1c8c822076bf22dab5c33 (patch) | |
| tree | c7978abf4bba0a2718cd0f9c0c0efe93d734d226 /drivers/rtc | |
| parent | Merge branch 'linus' into release (diff) | |
| parent | ACPI: simplify buffer management for acpi_pci_bind() etc. (diff) | |
| download | linux-dev-ec9f168fcc344d2ffec1c8c822076bf22dab5c33.tar.xz linux-dev-ec9f168fcc344d2ffec1c8c822076bf22dab5c33.zip | |
Merge branch 'simplify_PRT' into release
Conflicts:
drivers/acpi/pci_irq.c
Note that this merge disables
e1d3a90846b40ad3160bf4b648d36c6badad39ac
pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/rtc')
0 files changed, 0 insertions, 0 deletions