r3876 - trunk/kernel/source/linux-2.6

[Bastian Blank]

Author: waldi
Date: 2005-08-15 09:21:19 +0000 (Mon, 15 Aug 2005)
New Revision: 3876

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



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:/people/waldi/kernel/source/linux-2.6:3741

   + 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:3869