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

From: Stephen Rothwell
Date: Sun Feb 17 2013 - 22:35:59 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/ between commit 70730bca1331 ("kernel: Replace with a bc script") from the kbuild tree and commit
63a3f603413f (" Eliminate Perl warning") from the tip tree.

I just droppped the tip tree version (I deleted the file) and can carry
the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature