Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace
timeconst.pl with a bc script") from the kbuild tree and commit
"timeconst.pl: remove deprecated defined(@array)" from the akpm tree.

I just dropped the akpm tree patch since the file had been deleted by the
kbuild tree commit.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au