Skip to content
GitLab
Explore
Sign in
Commit
38a5d673
authored
Feb 28, 2011
by
Grant Likely
Browse files
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts: drivers/spi/pxa2xx_spi_pci.c
parents
0bfd95a2
f5412be5
Changes
738
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