| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Sat Jul 24 09:49:13 2010 -0600 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Sat Jul 24 09:49:13 2010 -0600 |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 [diff] | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 [diff] |
Merge commit 'v2.6.35-rc6' into devicetree/next Conflicts: arch/sparc/kernel/prom_64.c