diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-07 11:54:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-07 11:54:40 +0100 |
| commit | 63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (patch) | |
| tree | 34150d2e7ac4eb6c00f4bc96991947f71a338a0d /arch/parisc/include/asm/pgalloc.h | |
| parent | 95bf15f386417f3ba80bb860c1385b1ebfdcdffa (diff) | |
| parent | e689d6df8257f92abf59e93736632b79c9b2aa66 (diff) | |
| download | linux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.tar.bz2 | |
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Conflicts:
drivers/spi/spi-fsl-dspi.c
Diffstat (limited to 'arch/parisc/include/asm/pgalloc.h')
0 files changed, 0 insertions, 0 deletions