linux-next: manual merge of the trivial tree with the s390 tree

From: Stephen Rothwell
Date: Mon Jun 20 2011 - 23:38:14 EST

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/s390/kvm/sie64a.S between commit 57e98c34511e ("[S390] move sie code
to entry.S") from the s390 tree and commit e44ba033c565 ("treewide:
remove duplicate includes") from the trivial tree.

The former merged this file into another file, so I just removed this file.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature