summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-09 21:38:44 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-09 21:38:44 +0200
commit5df3e0d953c8af6f5b96aa090824b929cb5ab599 (patch)
tree5ec703d42ebd1fa92150d110d4ce47d7891bf2cd /Makefile
parentNLM: Fix a memory leak in nlmsvc_testlock (diff)
parent[MIPS] Au1000: set the PCI controller IO base (diff)
downloadlinux-5df3e0d953c8af6f5b96aa090824b929cb5ab599.tar.xz
linux-5df3e0d953c8af6f5b96aa090824b929cb5ab599.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] Au1000: set the PCI controller IO base [MIPS] Alchemy: Fix USB initialization. [MIPS] IP32: Fix fatal typo in address computation.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions