aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-10 15:56:09 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-10 15:56:09 -0800
commit40e38d30432a749b68d4c6e2038764ed1d3c846e (patch)
tree81ac2a33bfcae387424199cc99360a0b56f5b62e /init
parentc70a1ce873b82f17dd99e0397227ceb578a5d57f (diff)
parent8a93c4968fc177844680987b31d00d1fc3bc02aa (diff)
downloadvexpress-lsk-40e38d30432a749b68d4c6e2038764ed1d3c846e.tar.gz
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] Alchemy: Fix PCI-memory access [MIPS] Fix N32 SysV IPC routines [MIPS] PNX8550: Fix system timer initialization
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions