diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 15:24:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 15:24:39 +1100 |
| commit | 83548563c157403ba219b5bd9c59141f11377182 (patch) | |
| tree | 778e58f318fb178bfd8d5580f5437368cd7b6f7d /include/dt-bindings/pinctrl | |
| parent | 7ddcdb2ccdcae0838a39b1bf7b0773c5540da847 (diff) | |
| parent | 7679372dd5f9a7176914398576d802379bb3c634 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
drivers/misc/mei/hbm.c
Diffstat (limited to 'include/dt-bindings/pinctrl')
0 files changed, 0 insertions, 0 deletions