]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
commit2192482ee5ce5d5d4a6cec0c351b2d3a744606eb
tree15ab3c23d05e98829741b03922b51b81fd102b64
parent500b9fc922cbec572f4fd1436533bfaed5011262
parenta68fefe0d2f364ac3d8497ef37dcad713c261103
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mm/Kconfig
drivers/i2c/busses/Kconfig
drivers/rtc/Kconfig
drivers/serial/Kconfig