]> 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: 7bbf6a4 ab5c4a5)
Merge remote-tracking branch 'char-misc/char-misc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:52:24 +0000 (14:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:52:24 +0000 (14:52 +1100)
1  2 
arch/arm/include/asm/io.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/io.h
Simple merge
Linux kernel for KaRo TX COM modules