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 /include/asm-m68k/motorola_pgtable.h | |
| parent | b2576e1d4408e134e2188c967b1f28af39cd79d4 (diff) | |
| parent | 087da3b4e2d7d3ef70a4fa649b9a286fdeb0e44e (diff) | |
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 'include/asm-m68k/motorola_pgtable.h')
0 files changed, 0 insertions, 0 deletions