diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 10:24:18 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 10:24:18 +0100 |
| commit | e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd (patch) | |
| tree | d037f30224ad11cc4875ff9868d9bc983bd3522a /drivers/watchdog/shwdt.c | |
| parent | watchdog: shwdt: driver model conversion. (diff) | |
| parent | sh: pci: Support asynchronous initialization of SH-X3 PCIe channels. (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| download | linux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.tar.xz linux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.zip | |
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest