From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 29 Dec 2008 08:42:58 +0000 (+0100)
Subject: Merge branch 'linus' into timers/hrtimers
X-Git-Tag: v2.6.30-rc1~657^2~3^4~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce74d9296c971b2355c26984ad0bc538e34dd6c;p=pandora-kernel.git

Merge branch 'linus' into timers/hrtimers

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c
---

0ce74d9296c971b2355c26984ad0bc538e34dd6c
Reading git-diff-tree failed