summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/chrp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 17:29:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 17:29:53 -0800
commit375b6f5a40a3d8373561a3dbeed440a845e6d379 (patch)
tree7fe903bdfd0f67436c648394b0bcbdda55379689 /arch/powerpc/platforms/chrp
parentd8a3515e2a9523f8ed56d1f4537d16338bda2bc2 (diff)
parent09579770dcb8769f4f61046dcd01cc758cfa6d91 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix build error - arch/ia64/kernel/perfmon.c
Diffstat (limited to 'arch/powerpc/platforms/chrp')
0 files changed, 0 insertions, 0 deletions