On Mon, Mar 8, 2010 at 9:20 AM, Stephen Rothwell [off-list ref] wrote:

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/filesystems/proc.txt between commit
34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of
mm_counter") from Linus' tree and commit
cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 ("doc: typo - Table 1-2 should
refer to "status", not "statm"") from the trivial tree.

Thanks for the notification and the fix. I am glad my trivial patch is
considered into the  next level of code merge....

-- 
regards,

Mulyadi Santosa
Freelance Linux trainer and consultant

blog: the-hydra.blogspot.com
training: mulyaditraining.blogspot.com