Subject: linux-next: manual merge of the tests tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 15 Aug 2008 14:59:48 +1000

Hi Ananth,

Today's linux-next merge of the tests tree got a conflict in
lib/Kconfig.debug between commit 67182ae1c42206e516f7efb292b745e826497b24
("rcu, debug: detect stalled grace periods") from the sched tree and
commit 2b9b631dd2507b5480b752bcca946b9767b9bae1 ("Move rcutorture to
tests/") from the tests tree.

I sort of fixed it up.

Ananth, you should try to get the testing stuff into Linus' tree ...
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/