projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 644a9d3 f4a75d2)
Merge 3.7-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:21:36 +0000 (18:21 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:21:36 +0000 (18:21 -0800)
1  2 
arch/arm/include/asm/io.h patch | diff1 | diff2 | blob | history
mm/mmap.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/io.h
Simple merge
diff --cc mm/mmap.c
Simple merge
Domain: System / Kernel;