| commit | 8e5d0661b3948f3c5a143f32d192710375822af2 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Sep 25 13:37:05 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Sep 25 13:37:05 2012 +0100 |
| tree | ca18920d3f7219f7ffb7ca2fa372b82558938006 | |
| parent | 39a6ac11df6579df0361922f05c43f0fac8daa37 [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
Merge tag 'v3.6-rc6' into spi-drivers Linux 3.6-rc6 Conflicts: drivers/spi/spi-omap2-mcspi.c