MAINTAINERS | 3 +--
fs/Makefile | 2 +-
include/linux/hrtimer.h | 2 +-
kernel/posix-timers.c | 17 +++--------------
4 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit e5b19693fc36fdcee5af3588e40d1bda411f9603
Author: Stephen Hemminger <[EMAIL PROTECTED]>
Date: Tue Aug 5 10:00:12 2008 -0700
More merge fallout (posix-timers)
These files seem to have diverged for no apparent reason from
the 2.6.24.12 base.
commit ab8c7f52c79ee87c57c556147c3651362bfc85ab
Author: Stephen Hemminger <[EMAIL PROTECTED]>
Date: Tue Aug 5 09:59:38 2008 -0700
Couple more unionfs changes
Merge related stuff non code change.
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=e5b19693fc36fdcee5af3588e40d1bda411f9603
http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=ab8c7f52c79ee87c57c556147c3651362bfc85ab
_______________________________________________
svn mailing list
[email protected]
http://mailman.vyatta.com/mailman/listinfo/svn
