Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 03:54:12 +0000 (20:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 03:54:12 +0000 (20:54 -0700)
commitbbe5a96f678efcad83de8f900ab4ab963a99c805
treed1e03c52bc7d16c1ac9f41503b27da2f4b6b781d
parentf205ce83a766c08965ec78342f138cdc00631fba
parent0a375d75902c522ea36c6dc409296622f93db4a7
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Update defconfigs.
  sparc: Kill PROM console driver.