summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-24 17:32:16 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-24 17:32:16 -0700
commite0b9d139f2595fafbe95fcb7b40109db724900e8 (patch)
tree4fafc9622d913ea1398b4471ed6f6ce9b38cab1d /net
parent4f33e21c923c1656fb9e3d6fe2302e34e9e079a4 (diff)
parent1146fe30504a1edd8a434f500e1be139492570c9 (diff)
downloadlinux-3.10-e0b9d139f2595fafbe95fcb7b40109db724900e8.tar.gz
linux-3.10-e0b9d139f2595fafbe95fcb7b40109db724900e8.tar.bz2
linux-3.10-e0b9d139f2595fafbe95fcb7b40109db724900e8.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] SMTC: Make ack_bad_irq() safe with no IM backstop.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions