Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 3 May 2010 03:28:58 +0000 (11:28 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 3 May 2010 03:28:58 +0000 (11:28 +0800)
commitdf2071bd081408318d659cd14a9cf6ff23d874c9
treeb31291b5fd4b9f84c629833afbfaa8d431857475
parent97e3d94aac1c3e95bd04d1b186479a4df3663ab8
parentbe1066bbcd443a65df312fdecea7e4959adedb45
Merge git://git./linux/kernel/git/torvalds/linux-2.6
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/devices.c
crypto/algapi.c
crypto/tcrypt.c
drivers/crypto/mv_cesa.c
kernel/padata.c