Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
commitffee72d4681c8777918268a96aef42bdeb6c367b
tree4baf91483886d561c198ed0524ab54b783273e86
parentfb54d268329846aa13b2bc44a64d90e9b7131192
parentf72caf7e496465182eeda842ac66a5e75404ddf1
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
MAINTAINERS
drivers/dma/shdma.c
drivers/i2c/busses/Kconfig