Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c
This commit is contained in:
Arjan van de Ven 2008-10-17 09:20:26 -07:00
commit 651dab4264
6288 changed files with 355245 additions and 162323 deletions

View file

@ -441,7 +441,7 @@ static struct k_itimer * alloc_posix_timer(void)
return tmr;
if (unlikely(!(tmr->sigq = sigqueue_alloc()))) {
kmem_cache_free(posix_timers_cache, tmr);
tmr = NULL;
return NULL;
}
memset(&tmr->sigq->info, 0, sizeof(siginfo_t));
return tmr;