summaryrefslogtreecommitdiff
path: root/drivers/acorn
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:43:26 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:43:26 +0300
commitceaeee6ad6c2a24bf37d9f426414cf3007432352 (patch)
treefa330133773d10a9d7f329e3db2cc371999c6d86 /drivers/acorn
parent3743d33edf4e49376384822c57c4ee5cdf2d32f8 (diff)
parent5e2862eb5a263a0339a85545d96fb20995d67b1f (diff)
downloadlinux-ceaeee6ad6c2a24bf37d9f426414cf3007432352.tar.xz
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] Oprofile: Fix computation of number of counters. [MIPS] Alchemy: fix IRQ bases [MIPS] Alchemy: replace ffs() with __ffs() [MIPS] BCM1480: Fix interrupt routing, take 2.
Diffstat (limited to 'drivers/acorn')
0 files changed, 0 insertions, 0 deletions