Hi all,
Today's linux-next merge of the tip-core tree got a trivial conflict in
arch/x86/include/asm/setup.h between commit
dbca1df48e89d8aa59254fdc10ef16c16e73d94e ("x86: headers cleanup -
setup.h") from the x86 tree and commit
15c554439faedfa490389b31db893dc764245e88 ("headers_check fix: x86,
setup.h") from the tip-core tree.
I fixed it up as in tip/master.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgps0TrJU1cyD.pgp
Description: PGP signature
