diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-21 10:00:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-21 10:00:52 -0700 |
commit | 077a6c26696c63305eebafbb71890c95e2750b6d (patch) | |
tree | a11ecdf2bb4ecbad60f979601a14b0efa8f3fda8 /arch/sparc | |
parent | 73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c (diff) | |
parent | da51f9e10c48599bff498b378d040c4063adfe9d (diff) | |
download | linux-3.10-077a6c26696c63305eebafbb71890c95e2750b6d.tar.gz linux-3.10-077a6c26696c63305eebafbb71890c95e2750b6d.tar.bz2 linux-3.10-077a6c26696c63305eebafbb71890c95e2750b6d.zip |
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.
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions