]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07102f3 b214f11)
Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 30 Oct 2009 10:36:23 +0000 (10:36 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 30 Oct 2009 10:36:23 +0000 (10:36 +0000)
1  2 
sound/soc/omap/Kconfig patch | diff1 | diff2 | blob | history

diff --cc sound/soc/omap/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.