| commit | 38a5d6736e7f714cc56d58692001e66dcbb98799 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Mon Feb 28 01:36:21 2011 -0700 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Mon Feb 28 01:36:21 2011 -0700 |
| tree | 337d32375e10b04642013710c2c424514474b32c | |
| parent | 0bfd95a2a104dfc2469d68de52df99939371c0d4 [diff] | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 [diff] |
Merge commit 'v2.6.38-rc6' into devicetree/next Conflicts: drivers/spi/pxa2xx_spi_pci.c