diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 02:24:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 02:24:27 +0100 |
| commit | ee0849c9114a45c1ecd6136623a25f95892c59fe (patch) | |
| tree | b2c1b21f11e724795f569c75405beb6918fcf272 /arch | |
| 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... (diff) | |
| download | linux-ee0849c9114a45c1ecd6136623a25f95892c59fe.tar.xz 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 'arch')
| -rw-r--r-- | arch/arm/boot/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore index ce1c5ff746e7..3c79f85975aa 100644 --- a/arch/arm/boot/.gitignore +++ b/arch/arm/boot/.gitignore @@ -3,3 +3,4 @@ zImage xipImage bootpImage uImage +*.dtb |