diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-11 12:20:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-11 12:20:46 +1100 |
| commit | 136df84634a10ae0edae43f225a35d69a6156b90 (patch) | |
| tree | 649c11756e1de63aa821dc27bb8c73a9885b1ae1 /drivers/hid | |
| parent | d859e0f54b20ee5b81b4ac2e495b37ab77731a74 (diff) | |
| parent | 149792795d2bab33954bc025fcf145a8009683f6 (diff) | |
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/pci/host/pcie-rcar.c
Diffstat (limited to 'drivers/hid')
0 files changed, 0 insertions, 0 deletions