summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-10-08 09:30:04 +0200
committerTakashi Iwai <tiwai@suse.de>2013-10-08 09:30:04 +0200
commitd820306cbe56fb010f500ae58f9725f49812d39a (patch)
tree1c9554107c7f279d05d6f54b1b5d69735d51195d /arch/arm/boot/dts/kirkwood-km_kirkwood.dts
parent6d5eba5aac4ec9bba3d6b3e6425d857706d12ccb (diff)
parent39edac70e9aedf451fccaa851b273ace9fcca0bd (diff)
downloadblackbird-op-linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.gz
blackbird-op-linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix. Conflicts: sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-km_kirkwood.dts')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud