diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-20 21:22:54 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-20 21:22:54 +0200 |
| commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch) | |
| tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /drivers/watchdog/bcm47xx_wdt.c | |
| parent | Merge branch 'dt-bus-name' into for-next (diff) | |
| parent | tty/serial: fix generic earlycon option parsing (diff) | |
| download | linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.tar.xz linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.zip | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next
Conflicts:
arch/arm64/kernel/early_printk.c
Diffstat (limited to 'drivers/watchdog/bcm47xx_wdt.c')
0 files changed, 0 insertions, 0 deletions