diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-02-08 21:29:38 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-02-08 21:29:38 +0100 |
commit | 982d411c303a475424c67966990b5803cc536319 (patch) | |
tree | 92cce4cfba98ee266dc452c2535e6eaff35bf699 /kernel/time.c | |
parent | 2492250e4412c6411324c14ab289629360640b0a (diff) | |
parent | a7c4183be2d6a7da8c97a9b671b5f3aed321127e (diff) | |
download | op-kernel-dev-982d411c303a475424c67966990b5803cc536319.zip op-kernel-dev-982d411c303a475424c67966990b5803cc536319.tar.gz |
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
A few small WM8994 updates to go on top of the previous lot of things
that were sent. They collide with some -next work so I'd really like to
get them into 3.3-rc3 if possible to merge back up into the -next code.
All driver specific and unexciting in the grand scheme of things.
Diffstat (limited to 'kernel/time.c')
0 files changed, 0 insertions, 0 deletions