diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 14:05:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 14:05:49 -0800 |
| commit | abaaf3e12c74ef39c8ba185c485f63274264cb0f (patch) | |
| tree | 72851a2095cadb38473c1460a31942403daa2e4b /drivers/watchdog/shwdt.c | |
| parent | 71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63 (diff) | |
| parent | 2bd05db718cf452fe235c7c08083b2e60f787f3a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Avoid twl6040-codec PLL reconfiguration when not needed
mfd: Store twl6040-codec mclk configuration
Diffstat (limited to 'drivers/watchdog/shwdt.c')
0 files changed, 0 insertions, 0 deletions