diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 07:49:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 07:49:29 -0700 |
| commit | 6b1506c66809ddf6afd17e330db2999c878b5d90 (patch) | |
| tree | eb93535fcc3e568ffabd5400b019463633ea2c22 /sound/pci/hda/hda_local.h | |
| parent | Merge git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | dt: add empty of_machine_is_compatible (diff) | |
| download | linux-dev-6b1506c66809ddf6afd17e330db2999c878b5d90.tar.xz linux-dev-6b1506c66809ddf6afd17e330db2999c878b5d90.zip | |
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/pci/hda/hda_local.h')
0 files changed, 0 insertions, 0 deletions