diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-22 16:02:03 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-22 16:02:03 +1000 |
commit | bb514e85da54130440666dcc0a2beb3350d3bb3e (patch) | |
tree | 7a17924c94f9eba6cad0b34f8cfa373bc7440539 /Documentation/devicetree/bindings/gpio/gpio.txt | |
parent | 716668a0857998a1137bbb5f3565342cd3890a8e (diff) | |
parent | e284f3493206d4268267db4557c7ee6f89ed2314 (diff) |
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Diffstat (limited to 'Documentation/devicetree/bindings/gpio/gpio.txt')
0 files changed, 0 insertions, 0 deletions