diff options
author | 2012-03-08 17:24:27 -0800 | |
---|---|---|
committer | 2012-03-08 17:24:27 -0800 | |
commit | ee0849c9114a45c1ecd6136623a25f95892c59fe (patch) | |
tree | b2c1b21f11e724795f569c75405beb6918fcf272 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
parent | Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge (diff) | |
download | wireguard-linux-ee0849c9114a45c1ecd6136623a25f95892c59fe.tar.xz wireguard-linux-ee0849c9114a45c1ecd6136623a25f95892c59fe.zip |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull minor devicetree bug fixes and documentation updates from Grant Likely:
"Fixes up a duplicate #include, adds an empty implementation of
of_find_compatible_node() and make git ignore .dtb files. And fix up
bus name on OF described PHYs. Nothing exciting here."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
doc: dt: Fix broken reference in gpio-leds documentation
of/mdio: fix fixed link bus name
of/fdt.c: asm/setup.h included twice
of: add picochip vendor prefix
dt: add empty of_find_compatible_node function
ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions