diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 07:09:23 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 07:09:23 +0100 |
| commit | 614cd4a4ac3daf725508e372bce2160e2d8039a9 (patch) | |
| tree | 1c6dd9f7b7ec425b19e432bc1b34f30f69dd2d3e /fs/nfs/internal.h | |
| parent | ARM: tegra: add LED options back into tegra_defconfig (diff) | |
| parent | ARM: sunxi: dt: Change the touchscreen compatibles (diff) | |
| download | linux-614cd4a4ac3daf725508e372bce2160e2d8039a9.tar.xz linux-614cd4a4ac3daf725508e372bce2160e2d8039a9.zip | |
Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes
Allwinner fixes from Maxime Ripard:
Two fixes for device trees additions that got added in 3.14. One fixes the
interrupt types of some IPs, the other fixes up a compatible that got
introduced during 3.14
* tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux:
ARM: sunxi: dt: Change the touchscreen compatibles
ARM: sun7i: dt: Fix interrupt trigger types
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/nfs/internal.h')
0 files changed, 0 insertions, 0 deletions