]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'at91/at91-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 01:22:48 +0000 (12:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 01:22:48 +0000 (12:22 +1100)
commit9a3af1da6d2661d0bdaf2b7f745ee1eefcbd3172
tree778f3f455101e3d7a49fdb69cdb2b1b322aa7ff7
parent8281943ef933aabcabb2c3293b2d8051ddbc5f28
parentde21d1ddb36bf21706fd254ac57815bd08183879
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/setup.c