]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49ba4f9 42c364a)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:31:34 +0000 (08:31 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:31:34 +0000 (08:31 +0100)
This is a preliminary merge before the upcoming merge of generic parser
branch.

1  2 
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history
sound/usb/pcm.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/usb/pcm.c
Simple merge
Linux kernel for KaRo TX COM modules