Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)]
1  2 
MAINTAINERS
drivers/dma/shdma.c
drivers/i2c/busses/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge