Linus Torvalds
3b38f56c9d
Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ...
Pull DMA-mapping fix from Marek Szyprowski:
"A build bugfix for the device tree support for reserved memory
regions. Due to superfluous include the common code failed to build
on ARM64 and MIPS architectures.
The patch that caused the build break has lived at linux-next for
about two weeks and noone noticed the issue, what convinced me that
everything was ok"
* 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-11 19:11:59 -07:00
Device tree updates for v3.11
2013-07-04 15:51:45 -07:00
Device tree core updates for v3.12
2013-09-10 13:53:52 -07:00
of: Output devicetree alias names in uevent
2013-02-06 11:06:35 +00:00
Device tree core updates for v3.12
2013-09-10 13:53:52 -07:00
irq/of: Fix comment typo for irq_of_parse_and_map
2013-09-09 17:03:19 +01:00
Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2013-09-09 10:26:33 -07:00
Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2013-09-09 10:26:33 -07:00
net: of_mdio: fix behavior on missing phy device
2013-05-08 13:13:29 -07:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
of: Make of_get_phy_mode() return int i.s.o. const int
2013-08-28 20:50:19 +01:00
of: pci: add registry of MSI chips
2013-08-12 15:27:01 +00:00
of: Output devicetree alias names in uevent
2013-02-06 11:06:35 +00:00
drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-10 15:43:40 +02:00
open firmware: "/aliasas" -> "/aliases"
2013-06-18 13:46:26 +02:00
Device tree core updates for v3.12
2013-09-10 13:53:52 -07:00
of: Create function for counting number of phandles in a property
2013-02-13 10:09:31 +00:00
3b38f56c9d