diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 17:06:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 17:06:40 +1100 |
| commit | d5af0700570f674d2d36d84cffb33df531e8f6ca (patch) | |
| tree | ed905312e9437dcae3cf23d2dd6c8484d85527e9 /Documentation/devicetree/bindings/reset/sirf,rstc.txt | |
| parent | c3adf0fe6d6dc8b984a48cc49d0ae7f8408ed932 (diff) | |
| parent | 7eb3f6ffb5c3635e8cc5df7b19741b4bfc5894f5 (diff) | |
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-pxa/Kconfig
Diffstat (limited to 'Documentation/devicetree/bindings/reset/sirf,rstc.txt')
0 files changed, 0 insertions, 0 deletions