| commit | bc266185888e4033d8439b4fc6bdd14a41f4041e | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Mon Jan 30 08:32:37 2012 -0700 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Mon Jan 30 08:32:37 2012 -0700 |
| tree | 1455fafca38f366b092766594b9d71975bc12d50 | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f [diff] | |
| parent | b97b662174162b44944abd0fa9faea50006ba711 [diff] |
Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc Conflicts: drivers/spi/spi-s3c64xx.c