Subject: linux-next: manual merge of the bkl-removal tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Jul 2008 19:45:44 +1000

Hi Jonathan,

Today's linux-next merge of the bkl-removal tree got a conflict in
drivers/s390/char/monreader.c between commit
4b45ec0706ac12bf0c790747e55b4f3fec776c7a ("[S390] Cleanup monreader
printk messages.") from the s390 tree and commit
167ae8a4822ed405037e72d660acf3294ab32807 ("monreader: BKL pushdown") from
the bkl-removal tree.

Just a matter of overlapping additions. I can carry it.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/