summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 22:57:18 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 22:57:18 +0200
commit0708500d49e8439d9fe5529795bdc1485f0f46c3 (patch)
tree2019b8ebcd86c9b593e56ac1d630c921f130c8d3 /arch/alpha
parentMerge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 (diff)
parentMerge branch 'devicetree/merge' into devicetree/next (diff)
downloadlinux-0708500d49e8439d9fe5529795bdc1485f0f46c3.tar.xz
linux-0708500d49e8439d9fe5529795bdc1485f0f46c3.zip
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull device tree changes from Grant Likely: "Mostly documentation updates, but also includes an empty stub for non-CONFIG_OF builds." * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: dt/documentation: Fix value format description dt: add vendor prefix for EM Microelectronics ARM: DT: Add binding for GIC virtualization extentions (VGIC) of/irq: add empty irq_of_parse_and_map() for non-dt builds
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions