diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-20 10:36:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-20 10:36:40 +1000 |
| commit | e17b4934fae1e131c8ad11da6cd6cd078dd84484 (patch) | |
| tree | 728708c3d36f48f16b3920030e6b95e51a67ac8d /firmware/cxgb3 | |
| parent | 306935f626b7fa4dca08bda87e68ffbe89297adc (diff) | |
| parent | 37284bd93103ae36b5ea274a985d688fb16f7a38 (diff) | |
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
include/linux/serial_sci.h
Diffstat (limited to 'firmware/cxgb3')
0 files changed, 0 insertions, 0 deletions