Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Sep 2007 17:00:52 +0000 (10:00 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Sep 2007 17:00:52 +0000 (10:00 -0700)
commit077a6c26696c63305eebafbb71890c95e2750b6d
treea11ecdf2bb4ecbad60f979601a14b0efa8f3fda8
parent73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c
parentda51f9e10c48599bff498b378d040c4063adfe9d
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

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