Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorBen Dooks <ben-linux@fluff.org>
Mon, 3 Nov 2008 14:49:01 +0000 (14:49 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 3 Nov 2008 14:49:01 +0000 (14:49 +0000)
commite856359685143a2f65876e7db4e4aa0ef5dce7f0
treebbcafe7f23975979f7a2bc6fd1404908d5fd7bd1
parente3bd9ec5d8bfc90f9e1bd995677829e57a404061
parent45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
drivers/i2c/busses/i2c-s3c2410.c
drivers/rtc/rtc-s3c.c
drivers/watchdog/s3c2410_wdt.c