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

From: Stephen Rothwell
Date: Mon Feb 18 2013 - 00:52:42 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/ between commit 70730bca1331 ("kernel: Replace with a bc script") from the kbuild tree and commit
" 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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature