Merge 3.7-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:24:22 +0000 (18:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:24:22 +0000 (18:24 -0800)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge