diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-28 02:20:21 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-28 02:25:45 +0200 |
| commit | 88b48684fe2d4f6207223423227c80d5408bccaf (patch) | |
| tree | 856e9ce9f7b1ec5d94569925ac78c38daef71317 /drivers/watchdog/sbc60xxwdt.c | |
| parent | Merge branch 'tegra/soc' into next/cleanup2 (diff) | |
| parent | ARM: tegra: Include assembler.h in sleep.S to fix build break (diff) | |
| download | linux-88b48684fe2d4f6207223423227c80d5408bccaf.tar.xz linux-88b48684fe2d4f6207223423227c80d5408bccaf.zip | |
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2
* 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: Include assembler.h in sleep.S to fix build break
Diffstat (limited to 'drivers/watchdog/sbc60xxwdt.c')
0 files changed, 0 insertions, 0 deletions