From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Dec 2008 23:55:43 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~16623
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix offset calculation in compute_size()
  rtc: rtc-starfire fixes
---

e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13