Skip to content

Commit

Permalink
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history 
…/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
  • Loading branch information
Linus Torvalds committed Aug 27, 2009
2 parents 5311034 + b080f18 commit e99b1f2
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 136 deletions.
Loading

0 comments on commit e99b1f2

Please sign in to comment.