From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 21 Sep 2007 17:00:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23-rc8~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=077a6c26696c63305eebafbb71890c95e2750b6d;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] BCM1480: include <linux/init.h>.
  [MIPS] BCM1480: Export zbbus_mhz.
---

077a6c26696c63305eebafbb71890c95e2750b6d