Skip to content
Commit 38a5d673 authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.38-rc6' into devicetree/next 

Conflicts:
	drivers/spi/pxa2xx_spi_pci.c
parents 0bfd95a2 f5412be5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment