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)
commit9753b12767a7d3d2f2d36850ce5aaae59afbd685
tree9ce70729d9eef7c28490e6a9c5a4025fda412ba0
parent847e9170c77d3b4f57822ae1f4cf4f65c65a8254
parentcecf61bdee426a3e0a014f7e26990d09c71ed458
Merge git://git./linux/kernel/git/davem/sparc-2.6

* 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()