Date: Tue, 10 Jan 2006 20:14:18 +0100
From: Stefan Richter
To: Jody McIntyre
CC:  linux1394-devel
Subject: ieee1394 mismerge

Jody,

I just noticed that your "Remove amdtp, cmp drivers" patch was only 
partially applied in your git tree. amdtp.[ch] and cmp.[ch] are still 
there. The same partial patch is seen in Linus' tree.

http://www.kernel.org/git/?p=linux/kernel/git/scjody/ieee1394.git;a=commitdiff;h=7301c8d3a05dc52d33598364da7c4eb6ab6357eb
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7301c8d3a05dc52d33598364da7c4eb6ab6357eb

It became apparent because people are still busy fixing amdtp:
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ff92053ddff48d9d7908a353bd85f893944463e

I have not checked yet for any other discrepancies in your or Linus' tree.
-- 
Stefan Richter
-=====-=-==- ---= -=-=-
http://arcgraph.de/sr/