diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 14:50:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 14:50:13 +1100 |
| commit | db3a6173067bb5188b66ee3fc3a1c6c145595ebb (patch) | |
| tree | e33bb8c0d55d8d4c2ed89810d3ffc7baa7f19257 /Documentation/pcmcia | |
| parent | aec965aed119556d1c048ee3c4c876ebda92241b (diff) | |
| parent | ee0a40fd288e1fc94f6baee68b5ed72d046860c9 (diff) | |
Merge remote-tracking branch 'ipmi/for-next'
Conflicts:
arch/powerpc/include/asm/opal.h
arch/powerpc/platforms/powernv/opal-wrappers.S
Diffstat (limited to 'Documentation/pcmcia')
0 files changed, 0 insertions, 0 deletions