]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Fri, 17 Dec 2010 15:43:17 +0000 (16:43 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 17 Dec 2010 15:43:17 +0000 (16:43 +0100)

Trivial merge