Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
Paul Mundt
2009-06-11 09:01:14 +03:00
745 changed files with 30239 additions and 9943 deletions

View File

@ -22,7 +22,7 @@
/*
* This read-write spinlock protects us from races in SMP while
* playing with xtime and avenrun.
* playing with xtime.
*/
__cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);