[GIT PULL] A few more device tree changes

Grant Likely grant.likely at secretlab.ca
Fri Nov 4 15:19:43 EST 2011


Hi Linus,

Updated pull req, this time with feeling (and the branch actually pushed out)

g.

The following changes since commit d6748066ad0e8b2514545998f8367ebb3906f299:

  Merge branch 'upstream' of
git://git.linux-mips.org/pub/scm/ralf/upstream-linus (2011-11-03
13:28:14 -0700)

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6 devicetree/merge

Grant Likely (1):
      Merge branch 'for-grant' of
git://sources.calxeda.com/kernel/linux into devicetree/merge

Nicolas Ferre (1):
      dt: add empty of_alias_get_id() for non-dt builds

Olof Johansson (1):
      dt/platform: minor cleanup

Rob Herring (1):
      ahci: add DT binding for Calxeda AHCI controller

Stephen Warren (1):
      dt: add empty of_machine_is_compatible

 .../devicetree/bindings/ata/calxeda-sata.txt       |   17 ++++++++++++
 drivers/ata/ahci_platform.c                        |    7 +++++
 drivers/of/platform.c                              |   28 +++++++++++--------
 include/linux/of.h                                 |   10 +++++++
 4 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/calxeda-sata.txt


On Fri, Nov 4, 2011 at 12:01 AM, Grant Likely <grant.likely at secretlab.ca> wrote:
> On Thu, Nov 3, 2011 at 11:56 PM, Grant Likely <grant.likely at secretlab.ca> wrote:
>> Hi Linus,
>>
>> A few more for 3.2.  Nothing exciting here.
>>
>> g.
>>
>> The following changes since commit d6748066ad0e8b2514545998f8367ebb3906f299:
>>
>>  Merge branch 'upstream' of
>> git://git.linux-mips.org/pub/scm/ralf/upstream-linus (2011-11-03
>> 13:28:14 -0700)
>>
>> are available in the git repository at:
>>
>>  git://git.secretlab.ca/git/linux-2.6 ..BRANCH.NOT.VERIFIED..
>
> Okay, well that was stupid.  I'll push out the branch and send out a
> new pull req.
>
> g.
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.


More information about the devicetree-discuss mailing list