Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:40:35 +0000 (15:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:40:35 +0000 (15:40 -0700)
commit9262e9149f346a5443300f8c451b8e7631e81a42
treef21b2d6f9270c7d0ff807f070e38d0f665582f21
parente37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb
parent6e990b50ed0b45d506ff6809034508d3e210497d
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Kill sun4v virtual device layer.
  [SERIAL] sunhv: Convert to of_driver layer.
  [SPARC64]: Mask out top 8-bits in physical address when building resources.
  [SERIAL] sunsu: Missing return statement in su_probe().
arch/sparc64/kernel/devices.c
drivers/serial/sunsu.c