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

From: Stephen Rothwell
Date: Wed Feb 13 2013 - 23:25:37 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/ between commit 63a3f603413f (" Eliminate
Perl warning") from the tip tree and commit " remove
deprecated defined(@array)" from the akpm tree.

These both fix the same problem, I arbitrarily chose the akpm tree version.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature