summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-01-20 14:31:52 +0100
committerTony Lindgren <tony@atomide.com>2012-01-20 14:31:52 +0100
commit967809bd7faf71ddc29c8081e0f21db8b201a0f4 (patch)
tree256bcce2b13a45b573b02ef73dcebe1f08a03593 /sound/soc/codecs
parentLinux 3.3-rc1 (diff)
parentinput: serio: ams-delta: toggle keyboard power over GPIO (diff)
downloadlinux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.tar.xz
linux-967809bd7faf71ddc29c8081e0f21db8b201a0f4.zip
Merge branch 'omap1-part2' into omap1
Conflicts: drivers/leds/leds-ams-delta.c
Diffstat (limited to 'sound/soc/codecs')
0 files changed, 0 insertions, 0 deletions