Merge commit 'v2.6.28-rc4' into timers/rtc
authorIngo Molnar <mingo@elte.hu>
Mon, 10 Nov 2008 08:10:44 +0000 (09:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 10 Nov 2008 08:10:44 +0000 (09:10 +0100)
Conflicts:
drivers/rtc/rtc-cmos.c


Trivial merge