| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Sat Mar 12 01:25:53 2011 -0700 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Sat Mar 12 01:25:53 2011 -0700 |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 [diff] | |
| parent | a5abba989deceb731047425812d268daf7536575 [diff] |
Merge commit 'v2.6.38-rc8' into spi/next Conflicts: drivers/spi/pxa2xx_spi_pci.c