Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 14:34:01 +0000 (07:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2008 14:34:01 +0000 (07:34 -0700)
commitd36e311070ee3a378a54142a168ff5cfedba33d5
tree4a5520362a9d9a024c4a170ebc19589fe6afa3a5
parent61d6cc54896811086b51fa78d440311974a09b3a
parent738eca74d1bd3e51180de179b7b74d4e34c4e5a3
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: get leo framebuffer working