summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/pseries/setup.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-08 00:53:13 +0400
committerArnd Bergmann <arnd@arndb.de>2012-01-08 00:53:13 +0400
commit23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch)
tree60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/powerpc/platforms/pseries/setup.c
parente195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff)
parent7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff)
downloadlinux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts: arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
0 files changed, 0 insertions, 0 deletions