Reverse 954f2d27, which I did not intend to apply to this branch.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>
Missed removal of drivers/rtc/dmi.c in previous reversal.
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.7' into pf-3.7