| commit | a5a64498c194c82ecad3a2d67cff6231cda8d3dd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Nov 10 09:10:44 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Nov 10 09:10:44 2008 +0100 |
| tree | 723d5d81419f9960b8d30ed9a2ece8a58d6c4328 | |
| parent | bb93d802ae5c1949977cc6da247b218240677f11 [diff] | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d [diff] |
Merge commit 'v2.6.28-rc4' into timers/rtc Conflicts: drivers/rtc/rtc-cmos.c