aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/power6-pmu.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 19:15:55 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-24 19:16:04 +0000
commit7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch)
tree14af84e9a635e59293edf81aa562b6740c57d310 /arch/powerpc/kernel/power6-pmu.c
parentMerge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2 (diff)
parentMerge branch 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcooper/linux-kirkwood into kirkwood/dt (diff)
downloadlinux-dev-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.xz
linux-dev-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/kernel/power6-pmu.c')
0 files changed, 0 insertions, 0 deletions