summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 07:49:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 07:49:29 -0700
commit6b1506c66809ddf6afd17e330db2999c878b5d90 (patch)
treeeb93535fcc3e568ffabd5400b019463633ea2c22 /sound
parent1a67a573b8d9f02211f36fbab50f6265dc49384a (diff)
parent50e07f888cb24b55e0d8283f631907794dd757c2 (diff)
downloadop-kernel-dev-6b1506c66809ddf6afd17e330db2999c878b5d90.zip
op-kernel-dev-6b1506c66809ddf6afd17e330db2999c878b5d90.tar.gz
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: dt: add empty of_machine_is_compatible ahci: add DT binding for Calxeda AHCI controller dt/platform: minor cleanup dt: add empty of_alias_get_id() for non-dt builds
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud