Skip to content
GitLab
Explore
Sign in
Mirrors
github.com
raspberrypi_linux
Commits
2e0e9434
Commit
2e0e9434
authored
Jan 05, 2012
by
Russell King
Browse files
Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c
parents
a32737e1
ef3a0bf5
Changes
431
Hide whitespace changes
Inline
Side-by-side
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