tree 04435004a39c68d335557bbe77f06153cdf9d709
parent e1825e7515010053e44287e6e78f9078cd1916a9
parent b270ee8a9fc9547eb781ce9ccd379450bcf9a204
author Linus Torvalds <torvalds@linux-foundation.org> 1228262143 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228262143 -0800

Merge git://git.kernel.org/pub/scm/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