diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
| commit | 8f9993f76aacfc58083fad04f8e1b6bbea33de23 (patch) | |
| tree | 90d7885b26b87d27ed4cdb4026e608908e8a8a4c /drivers/infiniband/hw/nes/nes.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 9918ceafd4a9e013572e03983f528017c29bb1cb (diff) | |
Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup
* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'drivers/infiniband/hw/nes/nes.h')
0 files changed, 0 insertions, 0 deletions