diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 19:36:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 19:36:42 +1100 |
| commit | f9f65c279d2f23c5788eb968411bc000d90d5be7 (patch) | |
| tree | 8549dcf4d86a5d601062f4a3f512cb59020bcc79 /arch/m32r | |
| parent | 8736489fab9ac556a1f0a545cbf798ebb96011b7 (diff) | |
| parent | 702e304f198f631d746d2f383c54acc07d604700 (diff) | |
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c
Diffstat (limited to 'arch/m32r')
0 files changed, 0 insertions, 0 deletions