linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* Please pull from 'merge' branch (for 2.6.30)
@ 2009-04-14 16:42 Kumar Gala
  2009-04-15  3:31 ` Paul Mackerras
  0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2009-04-14 16:42 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev

Please pull from 'merge' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge

to receive the following updates:

 Documentation/powerpc/dts-bindings/fsl/i2c.txt |   46 ++++---
 arch/powerpc/boot/dts/tqm8540.dts              |    4
 arch/powerpc/boot/dts/tqm8541.dts              |    4
 arch/powerpc/boot/dts/tqm8548-bigflash.dts     |    8 -
 arch/powerpc/boot/dts/tqm8548.dts              |    8 -
 arch/powerpc/boot/dts/tqm8555.dts              |    4
 arch/powerpc/boot/dts/tqm8560.dts              |    4
 arch/powerpc/configs/85xx/tqm8548_defconfig    |  164 +++++++------------------
 arch/powerpc/include/asm/mmu.h                 |    6
 arch/powerpc/include/asm/ppc-opcode.h          |   13 +
 arch/powerpc/kernel/cputable.c                 |    2
 arch/powerpc/mm/tlb_nohash.c                   |    1
 arch/powerpc/mm/tlb_nohash_low.S               |   14 +-
 include/linux/fsl_devices.h                    |    4
 14 files changed, 126 insertions(+), 156 deletions(-)

Kumar Gala (3):
      powerpc: Fix tlbilx opcode
      powerpc: Add support for early tlbilx opcode
      powerpc/mm: Fix compile warning

Wolfgang Grandegger (4):
      powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
      powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
      powerpc/85xx: TQM8548: update defconfig
      powerpc: Document new FSL I2C bindings and cleanup

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Please pull from 'merge' branch (for 2.6.30)
  2009-04-14 16:42 Please pull from 'merge' branch (for 2.6.30) Kumar Gala
@ 2009-04-15  3:31 ` Paul Mackerras
  2009-04-15  6:06   ` Kumar Gala
  0 siblings, 1 reply; 3+ messages in thread
From: Paul Mackerras @ 2009-04-15  3:31 UTC (permalink / raw)
  To: Kumar Gala; +Cc: linuxppc-dev

Kumar Gala writes:

> Please pull from 'merge' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge

Thanks, pulled.  I'll collect up a few more patches for .30 and send
Linus a pull request shortly.

By the way, I'm not planning to run test or next branches while Ben is
away.  He'll be back in plenty of time to collect the patches for .31
before the next merge window.

Paul.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Please pull from 'merge' branch (for 2.6.30)
  2009-04-15  3:31 ` Paul Mackerras
@ 2009-04-15  6:06   ` Kumar Gala
  0 siblings, 0 replies; 3+ messages in thread
From: Kumar Gala @ 2009-04-15  6:06 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev


On Apr 14, 2009, at 10:31 PM, Paul Mackerras wrote:

> Kumar Gala writes:
>
>> Please pull from 'merge' branch of
>>
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge
>
> Thanks, pulled.  I'll collect up a few more patches for .30 and send
> Linus a pull request shortly.
>
> By the way, I'm not planning to run test or next branches while Ben is
> away.  He'll be back in plenty of time to collect the patches for .31
> before the next merge window.

that's fine.  I figured as much for next.

- k

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-04-15  6:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-14 16:42 Please pull from 'merge' branch (for 2.6.30) Kumar Gala
2009-04-15  3:31 ` Paul Mackerras
2009-04-15  6:06   ` Kumar Gala

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).