From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 7 Aug 2007 00:52:42 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.23-rc3~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=111e2a513bac77d317011350f34f9cc30deb9806;p=thirdparty%2Fkernel%2Flinux.git

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.
---

111e2a513bac77d317011350f34f9cc30deb9806