tree 723d5d81419f9960b8d30ed9a2ece8a58d6c4328
parent bb93d802ae5c1949977cc6da247b218240677f11
parent f7160c7573615ec82c691e294cf80d920b5d588d
author Ingo Molnar <mingo@elte.hu> 1226304644 +0100
committer Ingo Molnar <mingo@elte.hu> 1226304644 +0100

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

Conflicts:
	drivers/rtc/rtc-cmos.c