diff options
| author | Olof Johansson <[email protected]> | 2012-10-19 23:17:51 +0000 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2012-10-19 23:17:51 +0000 |
| commit | 70f3900ee5c78d498dbbf880ec409f4b8f4da21e (patch) | |
| tree | 43a49fe2daee9eb79fc557e3c96ded8320f9d544 /lib/dma-debug.c | |
| parent | Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ARM: kirkwood: fix buttons on lsxl boards (diff) | |
| download | kernel-70f3900ee5c78d498dbbf880ec409f4b8f4da21e.tar.gz kernel-70f3900ee5c78d498dbbf880ec409f4b8f4da21e.zip | |
Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper:
- improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
- lsxl board dts fixes
* tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
ARM: kirkwood: fix buttons on lsxl boards
ARM: kirkwood: fix LEDs names for lsxl boards
ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
Diffstat (limited to 'lib/dma-debug.c')
0 files changed, 0 insertions, 0 deletions