summaryrefslogtreecommitdiffstats
path: root/arch/m68k/apollo
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 11:52:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 11:52:34 -0700
commit0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be (patch)
tree172582ed1e24905baad97c3390c3d03e8a6c1c50 /arch/m68k/apollo
parentb975dee3811ae0c58bd0e19cbd041cac8dd37ec5 (diff)
parent4a911b1efe219fa3c8af697be0054c72e13bdae4 (diff)
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] IP22: Fix detection of second HPC3 on Challenge S
Diffstat (limited to 'arch/m68k/apollo')
0 files changed, 0 insertions, 0 deletions