diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 11:23:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 11:23:32 +0000 |
| commit | c91cf25ebfbf3a5b336cbaa46646d37dd3d33127 (patch) | |
| tree | a2b1e6a0b9cbd391e8b9ca020e42b76652c52c2c /drivers/watchdog/mpcore_wdt.c | |
| parent | ff637d38ea6b9c54f708a2b9edabc1b0c73c6d0a (diff) | |
| download | linux-c91cf25ebfbf3a5b336cbaa46646d37dd3d33127.tar.bz2 | |
ASoC: Fix merge with PXA tree
Fix a merge issue caused by context overlap.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/watchdog/mpcore_wdt.c')
0 files changed, 0 insertions, 0 deletions