From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 8 May 2007 07:34:05 +0000 (-0700)
Subject: revert "rtc: Add rtc_merge_alarm()"
X-Git-Tag: v2.6.22-rc1~557
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=416ce32e704d778c283f2f86cadd836cd5d3696c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed