Merge tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux...
[pandora-kernel.git] / Makefile
diff --cc Makefile
Simple merge