From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 10 Nov 2008 08:10:44 +0000 (+0100)
Subject: Merge commit 'v2.6.28-rc4' into timers/rtc
X-Git-Tag: v2.6.29-rc1~571^2^8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a5a64498c194c82ecad3a2d67cff6231cda8d3dd;p=linux-2.6-block.git

Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
	drivers/rtc/rtc-cmos.c
---

a5a64498c194c82ecad3a2d67cff6231cda8d3dd