Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 00:52:42 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 00:52:42 +0000 (17:52 -0700)
commit111e2a513bac77d317011350f34f9cc30deb9806
treecc5e0f4d231ee5b7502a0a20958755af49703650
parentbced13738405b62c8203df9c103d4ba63d747872
parentc8154c8a9aaf548ad91e413da8b319858e37bc52
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Fix build.