diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:37:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:37:46 +1100 |
| commit | 33f839f5fb99702be82b59c122eafae353d53747 (patch) | |
| tree | e33aa7992e45d84a45134b9dc34f646cc4fa84a2 /Documentation/DocBook | |
| parent | 66a9f0e19cde396847345f8721003681c6365ce0 (diff) | |
| parent | 30dae2f98612d7c8cd855861b9de205ebd9ef4fa (diff) | |
Merge remote-tracking branch 'leds/for-next'
Conflicts:
arch/arm/mach-ux500/board-mop500.c
include/linux/of.h
Diffstat (limited to 'Documentation/DocBook')
0 files changed, 0 insertions, 0 deletions