Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
commit828d9982ebf994a20293b79e9773039f1d74d44f
authorBen Dooks <ben-linux@fluff.org>
Fri, 31 Oct 2008 14:33:41 +0000 (31 14:33 +0000)
committerBen Dooks <ben-linux@fluff.org>
Fri, 31 Oct 2008 14:33:41 +0000 (31 14:33 +0000)
treecd0d489f392c63e73e2d938ef99eecc342a21e04
parentebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c
parent721d5dfe7e516954c501d5e9d0dfab379cf4241a
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into s3c64xx
drivers/i2c/busses/i2c-s3c2410.c
drivers/rtc/rtc-s3c.c
drivers/serial/Kconfig
drivers/watchdog/s3c2410_wdt.c