Skip to content
GitLab
Explore
Sign in
Commit
e3c6d4ee
authored
Dec 28, 2008
by
David S. Miller
Browse files
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sparc64/kernel/idprom.c
parents
5bc05308
3c92ec8a
Changes
642
Hide whitespace changes
Inline
Side-by-side
Some changes are not shown.
For a faster browsing experience, only
20 of 642+
files are shown. Download one of the files below to see all changes.
Plain diff
Email patch
Preview
0%
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