diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-02-26 15:25:37 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-02-26 15:25:37 -0800 |
| commit | 01388c8b2f25dca19d532c361d38fcea9344789a (patch) | |
| tree | 0d9df7f65885b91032feb4a20ddf544730366554 /include/linux/ahci_platform.h | |
| parent | fce426b147a44cd1035bd6f95c4083444493cde1 (diff) | |
| parent | f529b98e2f235062c6660b19a8831ab49b63ace1 (diff) | |
| download | olio-linux-3.10-01388c8b2f25dca19d532c361d38fcea9344789a.tar.xz olio-linux-3.10-01388c8b2f25dca19d532c361d38fcea9344789a.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into mattis_dev
Conflicts:
arch/arm/mach-omap2/board-omap3h1.c
Change-Id: I0dca97c198de73582ecb07c75793f5a163d3a7c3
Diffstat (limited to 'include/linux/ahci_platform.h')
0 files changed, 0 insertions, 0 deletions