]> 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: 225a9be 2eaa9cf)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
security/tomoyo/common.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc security/tomoyo/common.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.