diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:15:55 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:16:04 +0000 |
| commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
| tree | 14af84e9a635e59293edf81aa562b6740c57d310 /arch/arm/mach-at91/include/mach/at91_st.h | |
| parent | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (diff) | |
| parent | c899445f9783309ac73073282d4c0ae27f51fa9a (diff) | |
| download | blackbird-op-linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.gz blackbird-op-linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.zip | |
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91_st.h')
0 files changed, 0 insertions, 0 deletions
