Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2011 18:03:27 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2011 18:03:27 +0000 (11:03 -0700)
commit78a3cc38f72cb0e6938ed8e796041d6d1beb8a28
tree400bf76711d46155b78090371d96a2d8b6ed994e
parent49743170556e13156a64f8f20fa412805771b4e1
parent76462232c21dc011462522387ddad0598a4f11e4
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  arch/powerpc: use printk_ratelimited instead of printk_ratelimit
  powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
  powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
  powerpc/e500: fix breakage with fsl_rio_mcheck_exception
  powerpc/p1022ds: fix audio-related properties in the device tree
  powerpc/85xx: fix NAND_CMD_READID read bytes number