r3874 - in trunk/kernel/source/linux-2.6: . debian

[Bastian Blank]

Author: waldi
Date: 2005-08-15 09:16:14 +0000 (Mon, 15 Aug 2005)
New Revision: 3874

Modified:
   trunk/kernel/source/linux-2.6/
   trunk/kernel/source/linux-2.6/debian/
Log:
Fix svk:merge properties.



Property changes on: trunk/kernel/source/linux-2.6
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6-merge-9224:3776
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6:3741



Property changes on: trunk/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3869