diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:19:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:19:08 -0800 |
| commit | e69128b947da0a2474447868f73c76311e2baedb (patch) | |
| tree | 73f84e2a0e55bcda2e14d28b011c250a14203e0d /drivers/infiniband/hw/nes/nes_user.h | |
| parent | 0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7 (diff) | |
| parent | 467f1cf504fbe8c50018c9b45ff465b379bc81f8 (diff) | |
| download | blackbird-op-linux-e69128b947da0a2474447868f73c76311e2baedb.tar.gz blackbird-op-linux-e69128b947da0a2474447868f73c76311e2baedb.zip | |
Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc
* 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91:
ARM: at91/at91sam9x5: Device tree definition files
ARM: at91/at91sam9x5: SoC basic support
ARM: at91/at91sam9x5: Configuration and Makefile
ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family
ARM: at91/at91sam9x5: PMC header file
ARM: at91/at91sam9x5: overall definition
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_user.h')
0 files changed, 0 insertions, 0 deletions
