diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 20:15:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 20:16:04 +0100 |
| commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
| tree | 14af84e9a635e59293edf81aa562b6740c57d310 /arch/powerpc/platforms/iseries/vio.c | |
| parent | Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ol... (diff) | |
| parent | Merge branch 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcoope... (diff) | |
| download | linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.xz 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/powerpc/platforms/iseries/vio.c')
0 files changed, 0 insertions, 0 deletions