Skip to content
GitLab
Explore
Sign in
Commit
4ec3eb13
authored
Jan 06, 2011
by
Russell King
Browse files
Merge branch 'smp' into misc
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
parents
24056f52
15095bb0
Loading
Loading
Loading
Changes
1000
Show whitespace changes
Inline
Side-by-side
Some changes are not shown.
For a faster browsing experience, only
20 of 1000+
files are shown. Download one of the files below to see all changes.
Plain diff
Email patch
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment