diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-13 10:04:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-13 10:04:59 +1000 |
| commit | 0fc342ba74b5863621e7a025da79db4a99cc6b2a (patch) | |
| tree | ab2caff2f16da1b357e9a2eb77c4816666789349 /Documentation/devicetree/bindings/pci/designware-pcie.txt | |
| parent | e4e0c450858f15bd45fcbe6bede17d579ed0cd7c (diff) | |
| parent | c7f3888ad7f0932a87fb76e6e4edff2a90cc7920 (diff) | |
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
kernel/acct.c
Diffstat (limited to 'Documentation/devicetree/bindings/pci/designware-pcie.txt')
0 files changed, 0 insertions, 0 deletions