diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/s390/include/asm/dasd.h | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
| download | linux-fsl-qoriq-d702d12167a2c05a346f49aac7a311d597762495.tar.xz | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/s390/include/asm/dasd.h')
0 files changed, 0 insertions, 0 deletions