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)
commit98c4514ff6e3072288770db66f91bdb15af8b433
treeeb5f2541e70d27144720e1735b463471025908f0
parent644a9d3b66e6983c2c1f3b24c3006d49b184c871
parentf4a75d2eb7b1e2206094b901be09adb31ba63681
Merge 3.7-rc6 into char-misc-next
arch/arm/include/asm/io.h
mm/mmap.c