Messages in this thread | ![/](/images/icornerl.gif) | | Date | Mon, 17 Aug 2009 18:06:10 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the sfi tree with the acpi tree |
| |
Hi all,
Today's linux-next merge of the sfi tree got a conflict in drivers/acpi/tables.c between commit 44043a4299724bb386ac7915a57a18b176e9df07 ("ACPI: check acpi_disabled in acpi_table_parse()") from the acpi tree and commit 55ec50ee899aa3199c126bb4b740abb9a4ab51df ("ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries()") from the sfi tree.
I used the sfi tree version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |