Merge commit 'v2.6.38-rc6' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 28 Feb 2011 08:36:21 +0000 (01:36 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 28 Feb 2011 08:36:21 +0000 (01:36 -0700)
commit38a5d6736e7f714cc56d58692001e66dcbb98799
tree337d32375e10b04642013710c2c424514474b32c
parent0bfd95a2a104dfc2469d68de52df99939371c0d4
parentf5412be599602124d2bdd49947b231dd77c0bf99
Merge commit 'v2.6.38-rc6' into devicetree/next

Conflicts:
drivers/spi/pxa2xx_spi_pci.c
drivers/spi/pxa2xx_spi_pci.c