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)
commita5a64498c194c82ecad3a2d67cff6231cda8d3dd
tree723d5d81419f9960b8d30ed9a2ece8a58d6c4328
parentbb93d802ae5c1949977cc6da247b218240677f11
parentf7160c7573615ec82c691e294cf80d920b5d588d
Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
drivers/rtc/rtc-cmos.c