Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 23:55:43 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 23:55:43 +0000 (15:55 -0800)
commite6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13
tree04435004a39c68d335557bbe77f06153cdf9d709
parente1825e7515010053e44287e6e78f9078cd1916a9
parentb270ee8a9fc9547eb781ce9ccd379450bcf9a204
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