git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ae4e9b 404b566)
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:23 +0000 (07:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 5 Jul 2011 05:33:23 +0000 (07:33 +0200)
1  2 
sound/soc/omap/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/omap/Makefile patch | diff1 | diff2 | blob | history

diff --cc sound/soc/omap/Kconfig
Simple merge
diff --cc sound/soc/omap/Makefile
Simple merge
Pandora Kernel Repository