]> 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: 0221c81 f379188)
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorPaul Mackerras <paulus@samba.org>
Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
1  2 
arch/powerpc/Kconfig patch | diff1 | diff2 | blob | history
include/linux/fsl_devices.h patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc include/linux/fsl_devices.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.