summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-02-08 21:29:38 +0100
committerTakashi Iwai <tiwai@suse.de>2012-02-08 21:29:38 +0100
commit982d411c303a475424c67966990b5803cc536319 (patch)
tree92cce4cfba98ee266dc452c2535e6eaff35bf699 /fs/ecryptfs
parent2492250e4412c6411324c14ab289629360640b0a (diff)
parenta7c4183be2d6a7da8c97a9b671b5f3aed321127e (diff)
downloadop-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 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud