tree ede7fe08271e40367d228ef4b7a79eba68030ad4
parent 19bfe37caa8184768ecc15269302f42036625259
author Andrew Morton <akpm@linux-foundation.org> 1178609645 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178648118 -0700

revert "rtc: Add rtc_merge_alarm()"

David says "884b4aaaa242a2db8c8252796f0118164a680ab5 should be reverted.  It
added an rtc_merge_alarm() call to the 2.6.20 kernel, which hasn't yet been
used by any in-tree driver; this patch obviates the need for that call, and
uses a more robust approach."

Cc: Scott Wood <scottwood@freescale.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>