summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/ppc-pci.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 17:30:03 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 17:30:03 (GMT)
commitf8974cb71310a05632aada76be6a27576d61e609 (patch)
treec0b6f59333796c95aa2de9a2eb755e9b68599b71 /arch/powerpc/include/asm/ppc-pci.h
parentc207f3a43194e108dda43dc9a1ce507335cff6b9 (diff)
parent0f22dd395fc473cee252b9af50249b8e0f32fde7 (diff)
downloadlinux-f8974cb71310a05632aada76be6a27576d61e609.tar.xz
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull core device tree changes for Linux v3.4 from Grant Likely: "This branch contains a minor documentation addition, a utility function for parsing string properties needed by some of the new ARM platforms, disables dynamic DT code that isn't used anywhere but on a few PPC machines, and exports DT node compatible data to userspace via UEVENT properties. Nothing earth shattering here." * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6: of: Only compile OF_DYNAMIC on PowerPC pseries and iseries arm/dts: OMAP3: Add omap3evm and am335xevm support drivercore: Output common devicetree information in uevent of: Add of_property_match_string() to find index into a string list
Diffstat (limited to 'arch/powerpc/include/asm/ppc-pci.h')
0 files changed, 0 insertions, 0 deletions