| commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 03 07:36:36 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 03 07:36:36 2012 -0700 |
| tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 | |
| parent | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 [diff] | |
| parent | d75d806cbbfb9c775e87779cd281c9c408c7aba3 [diff] |
Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris Pull CRIS changes from Jesper Nilsson: "Removal of some unused code from the CRIS port" * tag 'cris-for-linus-3.7' of git://jni.nu/cris: CRIS: Remove VCS simulator specific code cris/PCI: remove pcibios_assign_resources()