Hi Matthew, Today's linux-next merge of the drivers-x86 tree got a conflict in drivers/platform/x86/chromeos_laptop.c between a series of patches from Linus' tree and the same series of patches from the drivers-x86 tree.
There was an extra patch merged into Linus tree affecting this file, so I used that version. Please, when you rebase/rewrite stuff before sending it to Linus, also update your -next included tree (or just *don't do that* :-(). -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpxT4udQSe5Z.pgp
Description: PGP signature
