Merge remote-tracking branch 'spi/fix/core' into spi-linus
Mark Brown [Tue, 4 Jun 2013 17:52:04 +0000 (18:52 +0100)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge