linux-next: manual merge of the kbuild tree with the x86 tree

[Stephen Rothwell]

Hi Sam,

Today's linux-next merge of the kbuild tree got a conflict in
scripts/Makefile.lib between commit
d3dd3b5a29bb9582957451531fed461628dfc834 ("kbuild: allow compressors
(gzip, bzip2, lzma) to take multiple inputs") from the x86 tree and
commit c3434a63db85504449450625f229441c256b6f47 ("kbuild: fix spacing for
bzip2 commands") from the kbuild tree.

I used the version from the x86 tree which, as a side affect, fixed the
same spacing issue as the kbuild patch.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature