diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 18:24:18 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 18:24:18 +0900 |
| commit | e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd (patch) | |
| tree | d037f30224ad11cc4875ff9868d9bc983bd3522a /drivers/watchdog/shwdt.c | |
| parent | 8f5585ec3d173819dd7e751f661c33af39d7ec60 (diff) | |
| parent | 1da09c43ce5f4fcd98143feb7d2513fe6fd62848 (diff) | |
| parent | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (diff) | |
| download | talos-obmc-linux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.tar.gz talos-obmc-linux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.zip | |
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest
