diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-17 09:37:26 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-17 09:37:26 +0200 |
commit | 3d3638da49211cf15f8aec3030990ac6fba4c693 (patch) | |
tree | 6952d8d620b97d879ee0e6961b9634c00296a39f /arch/m68knommu | |
parent | sh: turn off irqs when disabling CMT/TMU timers (diff) | |
parent | sh: pci: SH7786 PCI ops. (diff) | |
parent | sh: smsc911x support for the rsk7203 board (diff) | |
parent | SH: convert migor to soc-camera as platform-device (diff) | |
parent | sh: Generic HAVE_PERF_COUNTER support. (diff) | |
download | linux-3d3638da49211cf15f8aec3030990ac6fba4c693.tar.xz linux-3d3638da49211cf15f8aec3030990ac6fba4c693.zip |
Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates' and 'sh/perf_counter'