diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 21:18:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 21:18:08 +0100 |
| commit | 9de44aa4dc969e4a46c2bfbd33d65bfa6ad2a15d (patch) | |
| tree | 4447278a96dc075c1001ae10b7d8e94b7ae0adce /arch/arm/mm/dma-mapping.c | |
| parent | 6fb18ac9366b74fadb2c1d0da88f143bfe87d001 (diff) | |
| parent | 079ed3681d748523e50c3947ca59507a7a181260 (diff) | |
| parent | ec3bd0e68a679a7af2c46af1ddc9af8b534a8b0e (diff) | |
| parent | c76f238e261b8d088f086c2e8551fa8402d86f42 (diff) | |
| parent | 0bbe6b5a73c00f8c8e7eb38fb86993f03cd64b70 (diff) | |
Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next