aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:39:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-26 20:39:31 -0700
commite99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9 (patch)
tree58b6fbd9effac9a45fb15fd0cd73e54833daaa55 /init/main.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff)
parentpowerpc/ps3: Update ps3_defconfig (diff)
downloadlinux-dev-e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9.tar.xz
linux-dev-e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ps3: Update ps3_defconfig powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions