linux-2.x original sparce tree
linux-2.x-sstfb modified  sparce tree

new version :
diff -u sstfb/kernel/linux-2.x sstfb/kernel/linux-2.x-sstfb > tmp.patch
tools/mktree.sh from_tree sstfb/kernel/linux-2.x
in from_tree sstfb/kernel/linux-2.x ; cvs tag LINUX_2_X_Y
tools/mktree.sh from_tree sstfb/kernel/linux-2.x-sstfb
cat tmp.patch | patch 
correct merge pb
in from_tree sstfb/kernel/linux-2.x-sstfb ; cvs tag LINUX_2_X_Y

