git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc57da3 27762b2)
Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...
authorJaroslav Kysela <perex@perex.cz>
Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
1  2 
sound/usb/caiaq/device.c patch | diff1 | diff2 | blob | history
sound/usb/usx2y/us122l.c patch | diff1 | diff2 | blob | history

diff --cc sound/usb/caiaq/device.c
Simple merge
diff --cc sound/usb/usx2y/us122l.c
Simple merge
Pandora Kernel Repository