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
mm/mmap.c

Simple merge
diff --cc mm/mmap.c
Simple merge