Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Nov 2008 15:54:47 +0000 (07:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Nov 2008 15:54:47 +0000 (07:54 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  rtc: rtc-sun4v fixes, revised
  sparc: Fix tty compile warnings.
  sparc: struct device - replace bus_id with dev_name(), dev_set_name()


Trivial merge