linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell
Date: Wed Feb 13 2013 - 23:25:37 EST
Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 63a3f603413f ("timeconst.pl: Eliminate
Perl warning") from the tip tree and commit "timeconst.pl: 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
Description: PGP signature