summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 11:45:32 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 11:45:32 -0700
commita88a8eff1e6e32d3288986a9d36c6a449c032d3a (patch)
treeff58da14f35ec5596d2c3e82267394206f106a8c /kernel
parentc39c06b96175a75e63da38dc3557a69e18a5f8ac (diff)
parent09abbcffb3ee63fb8712c008df0c6878860777b7 (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] cpu-bugs64.c: GCC 3.3 constraint workaround [MIPS] DEC: Initialise ioasic_ssr_lock
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions