tree cc5e0f4d231ee5b7502a0a20958755af49703650
parent bced13738405b62c8203df9c103d4ba63d747872
parent c8154c8a9aaf548ad91e413da8b319858e37bc52
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186447962 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186447962 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

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